| commit | 3086486d326b00ce308208e62e0e0de831f3563b | |
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 18 Apr 2007 19:18:25 +0000 (18 12:18 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 18 Apr 2007 19:30:49 +0000 (18 12:30 -0700) | ||
| tree | 2ee15108e631a05b91c3a1ec7da75fd7a780c3d0 | treesnapshot (tar.gz zip) |
| parent | 153920da5b62024c0aceef23252b82ad18e5fe22 | commitdiff |
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>
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 | diffblobblamehistory |