diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 4673a75a98da1f778c1323d8e5a4f7faff388589..bd005bc5c8c7d877ea9de79e2f6452d5703d0892 100644 (file)
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
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