[PATCH] Documentation gitk: Describe what --merge does

From

RQRichard Quirk <richard.quirk@gmail.com>

Date

Apr 27, 2008, 15:51 UTC

Message-ID

<1209311469-7561-1-git-send-email-richard.quirk@gmail.com>

Signed-off-by: Richard Quirk <richard.quirk@gmail.com>
---
 Documentation/gitk.txt |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index ed3ba83..edd6547 100644
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -41,6 +41,11 @@ frequently used options.
 
 	Show all branches.
 
+--merge::
+
+	Show the differences between HEAD and MERGE_HEAD for files with
+	conflicts after a merge.
+
 <revs>::
 
 	Limit the revisions to show. This can be either a single revision

-- 
1.5.5.1.79.g57cf