diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-18 12:18:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-18 12:30:49 -0700 |
| commit | 3086486d326b00ce308208e62e0e0de831f3563b (patch) | |
| tree | 2ee15108e631a05b91c3a1ec7da75fd7a780c3d0 /convert.c | |
| parent | 153920da5b62024c0aceef23252b82ad18e5fe22 (diff) | |
| download | git-3086486d326b00ce308208e62e0e0de831f3563b.tar.gz | |
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>
Diffstat (limited to 'convert.c')
0 files changed, 0 insertions, 0 deletions