| commit | 8c4bcd34bd194d7932a153f464cbc6ada7b27b46 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 17 Oct 2012 17:26:51 +0000 (17 10:26 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 17 Oct 2012 17:26:51 +0000 (17 10:26 -0700) | ||
| tree | 17331f7107c0353a5adac2451fc6e817ce16e902 | treesnapshot (tar.gz zip) |
| parent | 19100d3f7db17a85dc58265ae5388b1bf483f44f | commitdiff |
| parent | e0e2065f74500119d5e12524992273de362acd30 | commitdiff |
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
* 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 |