Junio C Hamano 8c4bcd34bd Merge branch 'jc/ll-merge-binary-ours' into maint ...

* jc/ll-merge-binary-ours:
  ll-merge: warn about inability to merge binary files only when we can't
  attr: "binary" attribute should choose built-in "binary" merge driver
  merge: teach -Xours/-Xtheirs to binary ll-merge driver

2012-10-17 10:26:51 -07:00

34 KiB

Raw Blame History

View Raw