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)
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found