summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-02-25 08:27:50 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-02-25 08:28:06 -0800
commit2a4a26b53d5ad18ded5d79b0cf0b617ebbb758b4 (patch)
tree5bb00d5bc31310536d4816689f577ef75dccf44d /Documentation/git-mergetool--lib.txt
parentMerge branch 'wk/user-manual' (diff)
parentPrepare for 1.8.1.5 (diff)
downloadtgif-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