diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-06-29 16:42:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-29 16:42:41 -0700 |
| commit | 76c82f90abde8820461e042c6654673f1147881d (patch) | |
| tree | ba3429adee1760fcf52f6e902c9acb6d3108feea /t/t3507-cherry-pick-conflict.sh | |
| parent | Merge branch 'maint-1.7.5' into maint (diff) | |
| parent | git-svn: Correctly handle root commits in mergeinfo ranges (diff) | |
| download | tgif-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 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions