| commit | 155a4b712efd3d917c228d155ec57ec2c09d7ac0 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 9 Sep 2012 04:28:55 +0000 (8 21:28 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 9 Sep 2012 04:28:55 +0000 (8 21:28 -0700) | ||
| tree | 834dd2acfed03ef493f3ae7c64432eb1d203d071 | treesnapshot (tar.gz zip) |
| parent | a944af1d86e6171d68ed2a3aa67b1d68f00e1fe8 | commitdiff |
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>
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>
| Documentation/gitattributes.txt | diffblobblamehistory | |
| attr.c | diffblobblamehistory | |
| t/t6037-merge-ours-theirs.sh | diffblobblamehistory |