summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-06-28 14:51:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-06-28 14:51:12 -0700
commit912bd497e93f0235a5999a77f8d54f5ff80a3a03 (patch)
treec9878d7328aee0ddeff38cbe7a533da343f47cf0 /mergetools
parentGit 2.5.0-rc0 (diff)
parentMerge branch 'jk/stash-require-clean-index' into maint (diff)
downloadtgif-912bd497e93f0235a5999a77f8d54f5ff80a3a03.tar.xz
Sync with maint
* maint:
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions