X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgitk.txt;h=bd005bc5c8c7d877ea9de79e2f6452d5703d0892;hb=d43c07b8ee6684a0df8636a0c849605f0ffc066f;hp=4673a75a98da1f778c1323d8e5a4f7faff388589;hpb=9e8f6e7f6e8817db30a492e32fa92c1daf51b77c;p=git.git

diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 4673a75a9..bd005bc5c 100644
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -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