From: Jeff King Date: Mon, 10 Sep 2012 14:03:17 GMT Subject: Re: [PATCH 2/2] attr: "binary" attribute should choose built-in "binary" merge driver Message-ID: <20120910140317.GA7906@sigill.intra.peff.net> In-Reply-To: <1347165639-12149-3-git-send-email-gitster@pobox.com> On Sat, Sep 08, 2012 at 09:40:39PM -0700, Junio C Hamano wrote: > 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". Yeah, that seems like the obviously correct thing to do. In practice, most files would end up in the first few lines of ll_xdl_merge checking buffer_is_binary anyway, so I think this would really only make a difference when our "is it binary?" heuristic guesses wrong. > Documentation/gitattributes.txt | 2 +- > attr.c | 2 +- > t/t6037-merge-ours-theirs.sh | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) Patch itself looks good to me. -Peff