diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-10-17 10:26:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-17 10:26:51 -0700 |
| commit | 8c4bcd34bd194d7932a153f464cbc6ada7b27b46 (patch) | |
| tree | 17331f7107c0353a5adac2451fc6e817ce16e902 /t | |
| parent | 19100d3f7db17a85dc58265ae5388b1bf483f44f (diff) | |
| parent | e0e2065f74500119d5e12524992273de362acd30 (diff) | |
| download | git-8c4bcd34bd194d7932a153f464cbc6ada7b27b46.tar.gz | |
Merge branch 'jc/ll-merge-binary-ours' into maint
* jc/ll-merge-binary-ours:
ll-merge: warn about inability to merge binary files only when we can't
attr: "binary" attribute should choose built-in "binary" merge driver
merge: teach -Xours/-Xtheirs to binary ll-merge driver
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6037-merge-ours-theirs.sh | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/t/t6037-merge-ours-theirs.sh b/t/t6037-merge-ours-theirs.sh index 2cf42c73f1..3889eca4ae 100755 --- a/t/t6037-merge-ours-theirs.sh +++ b/t/t6037-merge-ours-theirs.sh @@ -53,7 +53,19 @@ test_expect_success 'recursive favouring ours' ' ! grep 1 file ' -test_expect_success 'pull with -X' ' +test_expect_success 'binary file with -Xours/-Xtheirs' ' + echo file binary >.gitattributes && + + git reset --hard master && + git merge -s recursive -X theirs side && + git diff --exit-code side HEAD -- file && + + git reset --hard master && + git merge -s recursive -X ours side && + git diff --exit-code master HEAD -- file +' + +test_expect_success 'pull passes -X to underlying merge' ' git reset --hard master && git pull -s recursive -Xours . side && git reset --hard master && git pull -s recursive -X ours . side && git reset --hard master && git pull -s recursive -Xtheirs . side && |