diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-02-25 08:27:50 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-02-25 08:28:06 -0800 |
commit | 2a4a26b53d5ad18ded5d79b0cf0b617ebbb758b4 (patch) | |
tree | 5bb00d5bc31310536d4816689f577ef75dccf44d /Documentation/git-mergetool--lib.txt | |
parent | Merge branch 'wk/user-manual' (diff) | |
parent | Prepare for 1.8.1.5 (diff) | |
download | tgif-2a4a26b53d5ad18ded5d79b0cf0b617ebbb758b4.tar.xz |
Sync with 'maint'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions