diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-13 05:20:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-13 05:52:52 (GMT) |
| commit | f88ed172e7a391bd907798ad2a3347a83cd24317 (patch) | |
| tree | 6b044bd249b4b07e695dfb06eca3fea9d25b8458 /git-merge-recursive.py | |
| parent | 22c67ca88ec65c4f278e8c82b2d98f3bd025238b (diff) | |
| download | git-f88ed172e7a391bd907798ad2a3347a83cd24317.zip git-f88ed172e7a391bd907798ad2a3347a83cd24317.tar.gz git-f88ed172e7a391bd907798ad2a3347a83cd24317.tar.bz2 | |
Fix off-by-one error in git-merge
'git-merge -s' without a strategy name does not fail and does
not give usage as it should.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-recursive.py')
0 files changed, 0 insertions, 0 deletions