diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-10-17 10:26:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-17 10:26:51 -0700 |
| commit | 8c4bcd34bd194d7932a153f464cbc6ada7b27b46 (patch) | |
| tree | 17331f7107c0353a5adac2451fc6e817ce16e902 /Documentation/user-manual.txt | |
| parent | 19100d3f7db17a85dc58265ae5388b1bf483f44f (diff) | |
| parent | e0e2065f74500119d5e12524992273de362acd30 (diff) | |
| download | git-8c4bcd34bd194d7932a153f464cbc6ada7b27b46.tar.gz git-8c4bcd34bd194d7932a153f464cbc6ada7b27b46.tar.xz | |
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
Diffstat (limited to 'Documentation/user-manual.txt')
0 files changed, 0 insertions, 0 deletions