Merge branch 'ap/svn'

diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index ed3ba83c530411801dd1cd8980cad4d005962690..50d12da89fca37b60a024aeb2ac6de9cb2daf001 100644 (file)
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -41,6 +41,12 @@ frequently used options.
 
        Show all branches.
 
+--merge::
+
+       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.
+
 <revs>::
 
        Limit the revisions to show. This can be either a single revision