| commit | e6d29a4b47cf476e18658609033bdee4c42db3b8 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 15 Sep 2012 04:39:56 +0000 (14 21:39 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 15 Sep 2012 04:39:56 +0000 (14 21:39 -0700) | ||
| tree | 408497238b9a9f254cfcc54c7b51480bf58b5356 | treesnapshot (tar.gz zip) |
| parent | 1b9696548b9c9110109110d546b5e779095ee1d9 | commitdiff |
| parent | e0e2065f74500119d5e12524992273de362acd30 | commitdiff |
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
"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
| Documentation/gitattributes.txt | diff1 | diff2 | blobhistory |
| attr.c | diff1 | diff2 | blobhistory |
| ll-merge.c | diff1 | diff2 | blobhistory |