Andrew's git / gitweb.git / diff
?
merge script: allow custom strategies
authorJonathan Nieder <jrnieder@gmail.com>
Tue, 17 Aug 2010 07:05:32 +0000 (02:05 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 21:02:04 +0000 (14:02 -0700)
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>
No differences found