diff options
author | Michael J Gruber <git@grubix.eu> | 2017-08-21 14:53:14 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-08-21 17:12:44 -0700 |
commit | e2de82f27128441278da979ef101239c40188064 (patch) | |
tree | 0bd37d3e7c5b12f04ebafed232bee7f3000ca191 /Documentation/technical/api-xdiff-interface.txt | |
parent | Git 2.14.1 (diff) | |
download | tgif-e2de82f27128441278da979ef101239c40188064.tar.xz |
Documentation/git-merge: explain --continue
Currently, 'git merge --continue' is mentioned but not explained.
Explain it.
Signed-off-by: Michael J Gruber <git@grubix.eu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical/api-xdiff-interface.txt')
0 files changed, 0 insertions, 0 deletions