diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-17 02:05:10 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 14:02:04 -0700 |
| commit | 5d75a52b3a8870c3c1b27c5d791da5c9267e1fb5 (patch) | |
| tree | 75bdcb839fcc8952af596c408f2ac25cde9bf166 /date.c | |
| parent | 13dd255e4abb95895aaef72e2b93564be90cb49c (diff) | |
| download | git-5d75a52b3a8870c3c1b27c5d791da5c9267e1fb5.tar.gz | |
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>
Diffstat (limited to 'date.c')
0 files changed, 0 insertions, 0 deletions