| commit | 6be0f13c48c8a5549608329cc5fc368c128a68ee | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Aug 2010 19:55:21 +0000 (18 12:55 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Aug 2010 19:55:21 +0000 (18 12:55 -0700) | ||
| tree | e6848aabcd30adac43383aed2648a9fa8eee9374 | treesnapshot (tar.gz zip) |
| parent | d8f4dc84a9487a7c438853e980cba3e8cbeffb61 | commitdiff |
| parent | ae745487ad7a4ceca0e903da6df21be2c1ebfc29 | commitdiff |
Merge branch 'en/d-f-conflict-fix' into next
* en/d-f-conflict-fix:
merge-recursive: Fix multiple file rename across D/F conflict
t6031: Add a testcase covering multiple renames across a D/F conflict
merge-recursive: Fix typo
* en/d-f-conflict-fix:
merge-recursive: Fix multiple file rename across D/F conflict
t6031: Add a testcase covering multiple renames across a D/F conflict
merge-recursive: Fix typo
| merge-recursive.c | diff1 | diff2 | blobhistory |