summaryrefslogtreecommitdiff
path: root/attr.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-18 18:27:32 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-18 19:30:26 (GMT)
commit153920da5b62024c0aceef23252b82ad18e5fe22 (patch)
tree9b9d73e9f47df7aebd2a5fa5acb25a3f7518126b /attr.h
parentbe89cb239e8ec02e23015675cc8b2d60992a6cfc (diff)
downloadgit-153920da5b62024c0aceef23252b82ad18e5fe22.zip
git-153920da5b62024c0aceef23252b82ad18e5fe22.tar.gz
git-153920da5b62024c0aceef23252b82ad18e5fe22.tar.bz2
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>
Diffstat (limited to 'attr.h')
0 files changed, 0 insertions, 0 deletions