diff options
| author | Elijah Newren <newren@gmail.com> | 2010-08-12 19:50:49 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-12 21:22:55 -0700 |
| commit | 3cee92369ec8cc908fe3a4307f08cfc22a9ba954 (patch) | |
| tree | 9fbb24662d18d19e0331f4602dea56d7477e1e27 /merge-recursive.c | |
| parent | e923eaeb901ff056421b9007adcbbce271caa7b6 (diff) | |
| download | git-3cee92369ec8cc908fe3a4307f08cfc22a9ba954.tar.gz | |
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>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions