diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-08 21:28:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-08 21:28:55 -0700 |
| commit | 155a4b712efd3d917c228d155ec57ec2c09d7ac0 (patch) | |
| tree | 834dd2acfed03ef493f3ae7c64432eb1d203d071 /ll-merge.c | |
| parent | a944af1d86e6171d68ed2a3aa67b1d68f00e1fe8 (diff) | |
| download | git-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 'll-merge.c')
0 files changed, 0 insertions, 0 deletions