Documentation: clarify commits affected by gitk --merge

Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years ago · 3021faf656
1 changed files with 2 additions and 1 deletions
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@ -47,7 +47,8 @@ frequently used options.
				@@ -47,7 +47,8 @@ frequently used options.

 	After an attempt to merge stops with conflicts, show the commits on
 	the history between two branches (i.e. the HEAD and the MERGE_HEAD)
-	that modify the conflicted files.
+	that modify the conflicted files and do not exist on all the heads
+	being merged.

 --argscmd=<command>::
 	Command to be run each time gitk has to determine the list of