aboutsummaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-06-29 16:42:41 -0700
committerJunio C Hamano <gitster@pobox.com>2011-06-29 16:42:41 -0700
commit76c82f90abde8820461e042c6654673f1147881d (patch)
treeba3429adee1760fcf52f6e902c9acb6d3108feea /git-mergetool.sh
parentf5cfd52f7b85d693b3782297819981a502a0135b (diff)
parent124b70a2adad2b2efdf50150a6840f1327d2f2cd (diff)
downloadgit-76c82f90abde8820461e042c6654673f1147881d.tar.gz
git-76c82f90abde8820461e042c6654673f1147881d.tar.xz
Merge git://bogomips.org/git-svn into maint
* git://bogomips.org/git-svn: git-svn: Correctly handle root commits in mergeinfo ranges git-svn: Disambiguate rev-list arguments to improve error message git-svn: Demonstrate a bug with root commits in mergeinfo ranges
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions