OSDN Git Service

(root) / git-core / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 153920d) | patch
Allow low-level driver to specify different behaviour during internal merge.
authorJunio C Hamano <junkio@cox.net>
Wed, 18 Apr 2007 19:18:25 +0000 (12:18 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 18 Apr 2007 19:30:49 +0000 (12:30 -0700)
commit3086486d326b00ce308208e62e0e0de831f3563b
tree2ee15108e631a05b91c3a1ec7da75fd7a780c3d0tree | snapshot
parent153920da5b62024c0aceef23252b82ad18e5fe22commit | diff
Allow low-level driver to specify different behaviour during internal merge.

This allows [merge "drivername"] to have a variable "recursive"
that names a different low-level merge driver to be used when
merging common ancestors to come up with a virtual ancestor.

Signed-off-by: Junio C Hamano <junkio@cox.net>
merge-recursive.c diff | blob | history
Mirror of official git.git repository
About OSDN
Find Software
Develop Software
Help