t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
authorElijah Newren <newren@gmail.com>
Fri, 13 Aug 2010 01:50:49 +0000 (19:50 -0600)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Aug 2010 04:22:55 +0000 (21:22 -0700)
commit3cee923...9ec8cc908fe3a4307f08cfc22a9ba954
tree9fbb246...2d18d19e0331f4602dea56d7477e1e27copy hash to clipboard (tree)
parente923eae...901ff056421b9007adcbbce271caa7b6copy hash to clipboard (diff)
t/t5520-pull.sh