Code

Custom low-level merge driver: change the configuration scheme.
authorJunio C Hamano <junkio@cox.net>
Wed, 18 Apr 2007 18:27:32 +0000 (11:27 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 18 Apr 2007 19:30:26 +0000 (12:30 -0700)
commit153920da5b62024c0aceef23252b82ad18e5fe22
tree9b9d73e9f47df7aebd2a5fa5acb25a3f7518126b
parentbe89cb239e8ec02e23015675cc8b2d60992a6cfc
Custom low-level merge driver: change the configuration scheme.

This changes the configuration syntax for defining a low-level
merge driver to be:

[merge "<<drivername>>"]
driver = "<<command line>>"
name = "<<driver description>>"

which is much nicer to read and is extensible.  Credit goes to
Martin Waitz and Linus.

In addition, when we use an external low-level merge driver, it
is reported as an extra output from merge-recursive, using the
value of merge.<<drivername>.name variable.

The demonstration in t6026 has also been updated.

Signed-off-by: Junio C Hamano <junkio@cox.net>
merge-recursive.c
t/t6026-merge-attr.sh