From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Jun 2015 19:21:45 +0000 (-0700)
Subject: Merge branch 'jc/ll-merge-expose-path'
X-Git-Tag: v2.5.0-rc0~22
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/49ac7358da163b0f8a32ce71723b2071f962d3fd?ds=inline;hp=--cc

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
---

49ac7358da163b0f8a32ce71723b2071f962d3fd