From: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue, 17 Aug 2010 07:05:32 +0000 (-0500)
Subject: merge script: allow custom strategies
X-Git-Tag: v1.7.3-rc0~16^2~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e69dccf8cd4576be804597b2960aa7d0020a65db?hp=e69dccf8cd4576be804597b2960aa7d0020a65db

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>
---