diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-08-17 02:06:06 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-08-18 14:02:04 -0700 |
| commit | f5d3a6f575b12af88561ad5a3b1fc8f866f49056 (patch) | |
| tree | 17c76b73b9eecf9452135ea56dabf2e678974524 /diff-delta.c | |
| parent | merge script: allow custom strategies (diff) | |
| download | tgif-f5d3a6f575b12af88561ad5a3b1fc8f866f49056.tar.xz | |
merge script: forbid merge -s index
Some git-merge-* commands are not merge strategies. This is based on
v1.6.1-rc1~294^2~7 (builtin-merge: allow using a custom strategy,
2008-07-30) but it is less smart: we just use a hard-coded list of
forbidden strategy names. It is okay if this falls out of date, since
the code is just an example.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-delta.c')
0 files changed, 0 insertions, 0 deletions