summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-04-13 14:19:29 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-13 14:19:47 -0700
commitdc0db2c0b919f8eb5f1760ce0b936c0a66364148 (patch)
tree65beb7cb7f54278dba1e76ece552b3948652cb4f /Documentation/git-mergetool--lib.txt
parentMerge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' (diff)
downloadtgif-dc0db2c0b919f8eb5f1760ce0b936c0a66364148.tar.xz
Fourth batch for post 2.8 cycle
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions