diff options
| author | Chris Packham <judge.packham@gmail.com> | 2016-12-14 21:37:57 +1300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-14 10:02:04 -0800 |
| commit | 042e290da6aee0a9f21cd5890ccf231c266e177e (patch) | |
| tree | 7056cb718d62c88dc75614b7f8b1a3c263bab346 /Documentation/gitk.txt | |
| parent | c261a87e704679203510d48ff4db7bc7006b8a5a (diff) | |
| download | git-042e290da6aee0a9f21cd5890ccf231c266e177e.tar.gz git-042e290da6aee0a9f21cd5890ccf231c266e177e.tar.xz | |
merge: ensure '--abort' option takes no arguments
Like '--continue', the '--abort' option doesn't make any sense with
other options or arguments to 'git merge' so ensure that none are
present.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitk.txt')
0 files changed, 0 insertions, 0 deletions