diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-27 11:57:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-27 11:57:19 -0800 |
| commit | cb99be7c7d2afc71106ffaf400c769c8e72f1bb2 (patch) | |
| tree | 66a78ff99d45bf4c9c1dba5867c48c08b0b44df5 /t | |
| parent | 722f53ca2feed5e41c2270fdaae25bde5b7582f4 (diff) | |
| parent | ee95ec5d58d536243966de6ee810d345074b755e (diff) | |
| download | git-cb99be7c7d2afc71106ffaf400c769c8e72f1bb2.tar.gz git-cb99be7c7d2afc71106ffaf400c769c8e72f1bb2.tar.xz | |
Merge branch 'js/merge'
* js/merge:
xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
xdl_merge(): make XDL_MERGE_ZEALOUS output simpler
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6023-merge-file.sh | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh index 86419964b..79dc58b2c 100755 --- a/t/t6023-merge-file.sh +++ b/t/t6023-merge-file.sh @@ -139,4 +139,24 @@ test_expect_success 'binary files cannot be merged' ' grep "Cannot merge binary files" merge.err ' +sed -e "s/deerit.$/deerit;/" -e "s/me;$/me./" < new5.txt > new6.txt +sed -e "s/deerit.$/deerit,/" -e "s/me;$/me,/" < new5.txt > new7.txt + +test_expect_success 'MERGE_ZEALOUS simplifies non-conflicts' ' + + ! git merge-file -p new6.txt new5.txt new7.txt > output && + test 1 = $(grep ======= < output | wc -l) + +' + +sed -e 's/deerit./&\n\n\n\n/' -e "s/locavit,/locavit;/" < new6.txt > new8.txt +sed -e 's/deerit./&\n\n\n\n/' -e "s/locavit,/locavit --/" < new7.txt > new9.txt + +test_expect_success 'ZEALOUS_ALNUM' ' + + ! git merge-file -p new8.txt new5.txt new9.txt > merge.out && + test 1 = $(grep ======= < merge.out | wc -l) + +' + test_done |