From 9f1915d3935ea6e5e0a5cc38355a2dc30c4a811f Mon Sep 17 00:00:00 2001
From: Richard Quirk <richard.quirk@gmail.com>
Date: Mon, 28 Apr 2008 22:58:35 +0200
Subject: [PATCH] Documentation gitk: Describe what --merge does

Signed-off-by: Richard Quirk <richard.quirk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 Documentation/gitk.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index ed3ba83c530..50d12da89fc 100644
--- 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