| commit | e69dccf8cd4576be804597b2960aa7d0020a65db | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Tue, 17 Aug 2010 07:05:32 +0000 (17 02:05 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Aug 2010 21:02:04 +0000 (18 14:02 -0700) | ||
| tree | f80eeb6691e0772ee317fafa2e9a6734769b46d7 | treesnapshot (tar.gz zip) |
| parent | 5d75a52b3a8870c3c1b27c5d791da5c9267e1fb5 | commitdiff |
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>
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>
| contrib/examples/git-merge.sh | diffblobblamehistory |