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
@ -774,7 +774,7 @@ To define a custom merge driver `filfre`, add a section to your
@@ -774,7 +774,7 @@ To define a custom merge driver `filfre`, add a section to your
@ -800,6 +800,9 @@ merge between common ancestors, when there are more than one.
@@ -800,6 +800,9 @@ merge between common ancestors, when there are more than one.
When left unspecified, the driver itself is used for both
internal merge and the final merge.
The merge driver can learn the pathname in which the merged result