| commit | 3f29dd6c2344c56aad263a82a773ead0d9fded30 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 31 Aug 2010 23:23:58 +0000 (31 16:23 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 31 Aug 2010 23:23:58 +0000 (31 16:23 -0700) | ||
| tree | 3c9747da395c4e478f84e8118f28f78e9e8c8ee0 | treesnapshot (tar.gz zip) |
| parent | aca35505db3706c87d391dd213e856f73edfd42c | commitdiff |
| parent | 96ecac677aa84639a0b8e0aa0d781b197a2d16fe | commitdiff |
Merge branch 'en/d-f-conflict-fix'
* en/d-f-conflict-fix:
merge-recursive: Avoid excessive output for and reprocessing of renames
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
Mark tests that use symlinks as needing SYMLINKS prerequisite
t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test
fast-import: Improve robustness when D->F changes provided in wrong order
fast-export: Fix output order of D/F changes
merge_recursive: Fix renames across paths below D/F conflicts
merge-recursive: Fix D/F conflicts
Add a rename + D/F conflict testcase
Add additional testcases for D/F conflicts
Conflicts:
merge-recursive.c
* en/d-f-conflict-fix:
merge-recursive: Avoid excessive output for and reprocessing of renames
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
Mark tests that use symlinks as needing SYMLINKS prerequisite
t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test
fast-import: Improve robustness when D->F changes provided in wrong order
fast-export: Fix output order of D/F changes
merge_recursive: Fix renames across paths below D/F conflicts
merge-recursive: Fix D/F conflicts
Add a rename + D/F conflict testcase
Add additional testcases for D/F conflicts
Conflicts:
merge-recursive.c