| commit | 5c5fe41199d7253d6ec7f830830aba5a7d886d5b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Jun 2015 17:37:00 +0000 (11 10:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Jun 2015 17:37:00 +0000 (11 10:37 -0700) | ||
| tree | 90c2c096a2f6c55fce70bddbe43a095068e19e05 | treesnapshot (tar.gz zip) |
| parent | cd8c39e2f7830aed031129240a1718dedef6b5b4 | commitdiff |
| parent | ef45bb1f8156030446658d5bfb3983ce214a9e16 | commitdiff |
Merge branch 'jc/ll-merge-expose-path' into next
Traditionally, external low-level 3-way merge drivers are expected
to produce their results based solely on the contents of the three
variants given in temporary files named by %O, %A and %B on their
command line. Additionally allow them to look at the final path
(given by %P).
* jc/ll-merge-expose-path:
ll-merge: pass the original path to external drivers
Traditionally, external low-level 3-way merge drivers are expected
to produce their results based solely on the contents of the three
variants given in temporary files named by %O, %A and %B on their
command line. Additionally allow them to look at the final path
(given by %P).
* jc/ll-merge-expose-path:
ll-merge: pass the original path to external drivers
| Documentation/gitattributes.txt | diff1 | diff2 | blobhistory |
| t/t6026-merge-attr.sh | diff1 | diff2 | blobhistory |