diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-17 07:05:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 21:02:04 (GMT) |
| commit | e69dccf8cd4576be804597b2960aa7d0020a65db (patch) | |
| tree | f80eeb6691e0772ee317fafa2e9a6734769b46d7 /aclocal.m4 | |
| parent | 5d75a52b3a8870c3c1b27c5d791da5c9267e1fb5 (diff) | |
| download | git-e69dccf8cd4576be804597b2960aa7d0020a65db.zip git-e69dccf8cd4576be804597b2960aa7d0020a65db.tar.gz git-e69dccf8cd4576be804597b2960aa7d0020a65db.tar.bz2 | |
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>
Diffstat (limited to 'aclocal.m4')
0 files changed, 0 insertions, 0 deletions