Jonathan Nieder e69dccf8cd merge script: allow custom strategies ...

The idea comes from v1.6.1-rc1~294^2~7 (builtin-merge: allow using a
custom strategy, 2008-07-30).

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2010-08-18 14:02:04 -07:00

13 KiB

Executable File

Raw Blame History

View Raw