diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-14 21:39:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-14 21:39:56 -0700 |
| commit | e6d29a4b47cf476e18658609033bdee4c42db3b8 (patch) | |
| tree | 408497238b9a9f254cfcc54c7b51480bf58b5356 /builtin/notes.c | |
| parent | Merge branch 'cn/branch-set-upstream-to' (diff) | |
| parent | ll-merge: warn about inability to merge binary files only when we can't (diff) | |
| download | git-e6d29a4b47cf476e18658609033bdee4c42db3b8.tar.gz git-e6d29a4b47cf476e18658609033bdee4c42db3b8.zip | |
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
Diffstat (limited to 'builtin/notes.c')
0 files changed, 0 insertions, 0 deletions