[PATCH] Documentation: clarify commits affected by gitk --merge

From: Sitaram Chamarty <sitaramc@gmail.com>
Date: Feb 6, 2009, 04:40 UTC
Message-ID: <20090206044053.GA6831@atcmail.atc.tcs.com>

Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com>
---

I remember being confused by this some weeks ago and someone clarified, so I thought I'd put it in.

 Documentation/gitk.txt |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 4673a75..bd005bc 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

-- 
1.6.1