summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-03 09:12:11 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-03 09:12:11 -0700
commit072dda68eafdefe56f9305c547771367353cf89d (patch)
treeb3f8a718b9b2a7ace0cf9d5011340ecfbdb4c840 /Documentation/git-mergetool--lib.txt
parentMerge branch 'kb/name-hash' into maint-1.8.1 (diff)
downloadtgif-072dda68eafdefe56f9305c547771367353cf89d.tar.xz
Start preparing for 1.8.1.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions