diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:27:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:27:29 -0700 |
| commit | d25c72f7da5116f7b7a1f88a59d2bc14415a03b2 (patch) | |
| tree | 74d5fcea2044616ca648d60004bb24623f62997b /merge-recursive.c | |
| parent | Merge branch 'dg/local-mod-error-messages' (diff) | |
| parent | pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches (diff) | |
| download | tgif-d25c72f7da5116f7b7a1f88a59d2bc14415a03b2.tar.xz | |
Merge branch 'en/rebase-against-rebase-fix'
* en/rebase-against-rebase-fix:
pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions