summaryrefslogtreecommitdiff
path: root/t/t4013/diff.log_-GF_master
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-09-08 21:28:55 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-08 21:28:55 -0700
commit155a4b712efd3d917c228d155ec57ec2c09d7ac0 (patch)
tree834dd2acfed03ef493f3ae7c64432eb1d203d071 /t/t4013/diff.log_-GF_master
parentmerge: teach -Xours/-Xtheirs to binary ll-merge driver (diff)
downloadtgif-155a4b712efd3d917c228d155ec57ec2c09d7ac0.tar.xz
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/t4013/diff.log_-GF_master')
0 files changed, 0 insertions, 0 deletions