Richard Quirk <richard.quirk@xxxxxxxxx> writes: > Signed-off-by: Richard Quirk <richard.quirk@xxxxxxxxx> > --- > 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. > + Hmm. "the differences" is technically correct in that it shows the commits on the diverged histories, but I suspect it would be more understandable if we used more explicit wording, like: 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
