| commit | 3cee92369ec8cc908fe3a4307f08cfc22a9ba954 | |
| author | Elijah Newren <newren@gmail.com> | |
| Fri, 13 Aug 2010 01:50:49 +0000 (12 19:50 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 13 Aug 2010 04:22:55 +0000 (12 21:22 -0700) | ||
| tree | 9fbb24662d18d19e0331f4602dea56d7477e1e27 | treesnapshot (tar.gz zip) |
| parent | e923eaeb901ff056421b9007adcbbce271caa7b6 | commitdiff |
t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t5520-pull.sh | diffblobblamehistory |