summaryrefslogtreecommitdiff
path: root/mergetools/diffuse
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-01-31 13:32:05 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-01-31 13:32:05 -0800
commit844f7e61c9c2fcacc05eaa826a4695f20050dce5 (patch)
tree6929313dff81381903b78110c48b2974d32ac58b /mergetools/diffuse
parentMerge branch 'ls/travis-p4-on-macos' into maint (diff)
parentgit-svn: document useLogAuthor and addAuthorFrom config keys (diff)
downloadtgif-844f7e61c9c2fcacc05eaa826a4695f20050dce5.tar.xz
Merge branch 'ew/svn-fixes' into maint
Meant eventually for 'maint'. * ew/svn-fixes: git-svn: document useLogAuthor and addAuthorFrom config keys git-svn: allow "0" in SVN path components
Diffstat (limited to 'mergetools/diffuse')
0 files changed, 0 insertions, 0 deletions