summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-08-26 22:55:05 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-08-26 22:55:05 -0700
commit4c3be636af97e95358a5535448c1087e5cc0796e (patch)
tree7466f61150a634edefbfef85ac92bd960ca8284d /Documentation/git-mergetool.txt
parentMerge branch 'tb/apply-with-crlf' (diff)
parentvcs-svn: rename repo functions to "svn_repo" (diff)
downloadtgif-4c3be636af97e95358a5535448c1087e5cc0796e.tar.xz
Merge branch 'bc/vcs-svn-cleanup'
Code clean-up. * bc/vcs-svn-cleanup: vcs-svn: rename repo functions to "svn_repo" vcs-svn: remove unused prototypes
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions