diff options
| author |  Richard Quirk <richard.quirk@gmail.com> | 2008-04-28 22:58:35 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-04-29 23:11:57 -0700 |
| commit | 9f1915d3935ea6e5e0a5cc38355a2dc30c4a811f (patch) | |
| tree | 83d80e5b926327534beec19c482ef6691a24c792 /git-merge.sh | |
| parent | Use the modern syntax of git-diff-files in t2002-checkout-cache-u.sh (diff) | |
| download | tgif-9f1915d3935ea6e5e0a5cc38355a2dc30c4a811f.tar.xz | |
Documentation gitk: Describe what --merge does
Signed-off-by: Richard Quirk <richard.quirk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions