diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-10-11 13:38:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-03 23:25:13 -0800 |
| commit | cee2d6ae6379e7c76e602d55ccc1d4babc1979c0 (patch) | |
| tree | 5363e19452ffd7c5e86c7ea68a7bc1ffd2f6c93e /t/t6035-merge-dir-to-symlink.sh | |
| parent | 1ee26571e97c64bccecfd26d1a1c1c631412a1b7 (diff) | |
| download | git-cee2d6ae6379e7c76e602d55ccc1d4babc1979c0.tar.gz | |
Aggressive three-way merge: fix D/F case
When the ancestor used to have a blob "P", your tree removed it, and the
tree you are merging with also removed it, the agressive three-way cleanly
merges to remove that blob. If the other tree added a new blob "P/Q"
while removing "P", it should also merge cleanly to remove "P" and create
"P/Q" (since neither the ancestor nor your tree could have had it, so it
is a typical "created in one").
The "aggressive" rule is not new anymore. Reword the stale comment.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6035-merge-dir-to-symlink.sh')
| -rwxr-xr-x | t/t6035-merge-dir-to-symlink.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6035-merge-dir-to-symlink.sh b/t/t6035-merge-dir-to-symlink.sh index b9a280e351..d1b22871c4 100755 --- a/t/t6035-merge-dir-to-symlink.sh +++ b/t/t6035-merge-dir-to-symlink.sh @@ -74,7 +74,7 @@ test_expect_success 'setup a merge where dir a/b-2 changed to symlink' ' git tag test2 ' -test_expect_failure 'merge should not have conflicts (resolve)' ' +test_expect_success 'merge should not have conflicts (resolve)' ' git reset --hard && git checkout baseline^0 && git merge -s resolve test2 && |