From: Richard Quirk <richard.quirk@gmail.com>
Date: Mon, 28 Apr 2008 20:58:35 +0000 (+0200)
Subject: Documentation gitk: Describe what --merge does
X-Git-Tag: v1.5.6-rc0~111
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9f1915d3935ea6e5e0a5cc38355a2dc30c4a811f?ds=inline;hp=9f1915d3935ea6e5e0a5cc38355a2dc30c4a811f

Documentation gitk: Describe what --merge does

Signed-off-by: Richard Quirk <richard.quirk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---