The part that grants Stephen's wish is unchanged from the earlier
"perhaps like this" patch, but this time with a bit of documentation
and test.

A more important change between the two actually is [PATCH 2/2].
When a "binary" synthetic attribute is given to a path, we used to
(1) disable textual diff and (2) disable CR/LF conversion, but it is
also sane to disable the textual merge for a path marked as
"binary", and setting the "-merge" attribute to summon the "binary"
ll-merge driver is the way to do so.

Junio C Hamano (2):
  merge: teach -Xours/-Xtheirs to binary ll-merge driver
  attr: "binary" attribute should choose built-in "binary" merge driver

 Documentation/gitattributes.txt    |  2 +-
 Documentation/merge-strategies.txt |  3 ++-
 attr.c                             |  2 +-
 ll-merge.c                         | 25 ++++++++++++++++++++-----
 t/       | 14 +++++++++++++-
 5 files changed, 37 insertions(+), 9 deletions(-)


To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to