Merge branch 'jc/ll-merge-expose-path'
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 19:21:45 +0000 (12:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 19:21:45 +0000 (12:21 -0700)
commit49ac7358da163b0f8a32ce71723b2071f962d3fd
tree7fc5bde677564c024ea04b583e9b109f127dd742
parent6da9f888daab2d18c1e5ae8252f631d38fb80e8a
parentef45bb1f8156030446658d5bfb3983ce214a9e16
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
Documentation/gitattributes.txt
t/t6026-merge-attr.sh