summaryrefslogtreecommitdiff
path: root/t/t6037-merge-ours-theirs.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-08 21:28:55 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-08 21:28:55 -0700
commit155a4b712efd3d917c228d155ec57ec2c09d7ac0 (patch)
tree834dd2acfed03ef493f3ae7c64432eb1d203d071 /t/t6037-merge-ours-theirs.sh
parenta944af1d86e6171d68ed2a3aa67b1d68f00e1fe8 (diff)
downloadgit-155a4b712efd3d917c228d155ec57ec2c09d7ac0.tar.gz
attr: "binary" attribute should choose built-in "binary" merge driver
The built-in "binary" attribute macro expands to "-diff -text", so that textual diff is not produced, and the contents will not go through any CR/LF conversion ever. During a merge, it should also choose the "binary" low-level merge driver, but it didn't. Make it expand to "-diff -merge -text". Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
-rwxr-xr-xt/t6037-merge-ours-theirs.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6037-merge-ours-theirs.sh b/t/t6037-merge-ours-theirs.sh
index 8d05671414..3889eca4ae 100755
--- a/t/t6037-merge-ours-theirs.sh
+++ b/t/t6037-merge-ours-theirs.sh
@@ -54,7 +54,7 @@ test_expect_success 'recursive favouring ours' '
'
test_expect_success 'binary file with -Xours/-Xtheirs' '
- echo "file -merge" >.gitattributes &&
+ echo file binary >.gitattributes &&
git reset --hard master &&
git merge -s recursive -X theirs side &&