Files
git/Documentation
Junio C Hamano e6d29a4b47 Merge branch 'jc/ll-merge-binary-ours'
"git merge -Xtheirs" did not help content-level merge of binary
files; it should just take their version.  Also "*.jpg binary" in
the attributes did not imply they should use the binary ll-merge
driver.

* 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-09-14 21:39:56 -07:00
..
2012-03-28 08:47:23 -07:00
2009-10-01 08:21:35 -04:00
2012-09-14 21:38:20 -07:00
2012-09-11 11:36:18 -07:00
2011-08-08 09:30:12 -07:00
2012-06-19 11:35:19 -07:00
2009-04-06 00:27:09 -07:00
2012-04-20 15:49:16 -07:00
2012-07-09 14:40:03 -07:00
2012-06-19 11:35:19 -07:00
2012-09-11 11:23:54 -07:00
2012-08-06 15:34:20 -07:00
2011-12-12 11:52:31 -08:00
2012-08-06 15:34:20 -07:00
2011-09-06 11:42:12 -07:00
2011-05-19 10:55:54 -07:00
2011-03-11 10:59:16 -05:00
2012-09-14 21:20:40 -07:00
2010-07-05 13:39:02 -07:00
2012-06-19 11:35:19 -07:00
2010-07-20 16:59:17 -07:00
2012-08-06 15:34:20 -07:00