projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e923eae) | patch
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)
commit3cee92369ec8cc908fe3a4307f08cfc22a9ba954
tree9fbb24662d18d19e0331f4602dea56d7477e1e27tree | snapshot
parente923eaeb901ff056421b9007adcbbce271caa7b6commit | diff
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>
t/t5520-pull.sh diff | blob | history
Git—the stupid content tracker