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 /Documentation/gitattributes.txt | |
| parent | 1b9696548b9c9110109110d546b5e779095ee1d9 (diff) | |
| parent | e0e2065f74500119d5e12524992273de362acd30 (diff) | |
| download | git-e6d29a4b47cf476e18658609033bdee4c42db3b8.tar.gz | |
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 'Documentation/gitattributes.txt')
| -rw-r--r-- | Documentation/gitattributes.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index e16f3e175b..462b79c120 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -927,7 +927,7 @@ file at the toplevel (i.e. not in any subdirectory). The built-in macro attribute "binary" is equivalent to: ------------ -[attr]binary -diff -text +[attr]binary -diff -merge -text ------------ |