diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-24 12:21:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-24 12:21:45 -0700 |
| commit | 49ac7358da163b0f8a32ce71723b2071f962d3fd (patch) | |
| tree | 7fc5bde677564c024ea04b583e9b109f127dd742 /contrib/persistent-https | |
| parent | Merge branch 'es/osx-header-pollutes-mask-macro' (diff) | |
| parent | ll-merge: pass the original path to external drivers (diff) | |
| download | git-49ac7358da163b0f8a32ce71723b2071f962d3fd.tar.gz git-49ac7358da163b0f8a32ce71723b2071f962d3fd.zip | |
Merge branch 'jc/ll-merge-expose-path'
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
Diffstat (limited to 'contrib/persistent-https')
0 files changed, 0 insertions, 0 deletions