| commit | 5d75a52b3a8870c3c1b27c5d791da5c9267e1fb5 | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Tue, 17 Aug 2010 07:05:10 +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 | 75bdcb839fcc8952af596c408f2ac25cde9bf166 | treesnapshot (tar.gz zip) |
| parent | 13dd255e4abb95895aaef72e2b93564be90cb49c | commitdiff |
merge script: merge -X<option>
Without this support, the scripted merge cannot pass t6037.
Based on v1.7.0-rc0~55^2~5 (git merge -X<option>, 2009-11-25).
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Without this support, the scripted merge cannot pass t6037.
Based on v1.7.0-rc0~55^2~5 (git merge -X<option>, 2009-11-25).
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| contrib/examples/git-merge.sh | diffblobblamehistory |