diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-10-17 19:26:51 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-17 19:26:51 +0200 |
| commit | 8c4bcd34bd194d7932a153f464cbc6ada7b27b46 (patch) | |
| tree | 17331f7107c0353a5adac2451fc6e817ce16e902 /daemon.c | |
| parent | Merge branch 'db/doc-custom-xmlto' into maint (diff) | |
| parent | ll-merge: warn about inability to merge binary files only when we can't (diff) | |
| download | git-8c4bcd34bd194d7932a153f464cbc6ada7b27b46.tar.xz git-8c4bcd34bd194d7932a153f464cbc6ada7b27b46.zip | |
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 'daemon.c')
0 files changed, 0 insertions, 0 deletions