projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 19100d3 e0e2065)
Merge branch 'jc/ll-merge-binary-ours' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Oct 2012 17:26:51 +0000 (10:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Oct 2012 17:26:51 +0000 (10:26 -0700)
commit8c4bcd34bd194d7932a153f464cbc6ada7b27b46
tree17331f7107c0353a5adac2451fc6e817ce16e902tree | snapshot
parent19100d3f7db17a85dc58265ae5388b1bf483f44fcommit | diff
parente0e2065f74500119d5e12524992273de362acd30commit | diff
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
Documentation/gitattributes.txt diff1 | diff2 | blob | history
attr.c diff1 | diff2 | blob | history
ll-merge.c diff1 | diff2 | blob | history
Git—the stupid content tracker