Documentation: clarify commits affected by gitk --merge
Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sitaram Chamarty committed
Feb 6, 2009 at 10:10 UTC
3021faf6562690658d0b9f9fdd7cbe8c9dd61628
1 file changed
+2
-1
Documentation/gitk.txt
+2
-1
@@ -47,7 +47,8 @@ frequently used options.
47
48
After an attempt to merge stops with conflicts, show the commits on
49
the history between two branches (i.e. the HEAD and the MERGE_HEAD)
50
- that modify the conflicted files.
50
+ that modify the conflicted files and do not exist on all the heads
51
+ being merged.
52
53
--argscmd=<command>::
54
Command to be run each time gitk has to determine the list of