global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-23 07:00:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
9dacffc04009529b37c94de9a26420f640cf3f59
git/ll-merge.c
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

10 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink