aboutsummaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorChris Packham <judge.packham@gmail.com>2016-12-14 21:37:56 +1300
committerJunio C Hamano <gitster@pobox.com>2016-12-14 10:02:04 -0800
commitc261a87e704679203510d48ff4db7bc7006b8a5a (patch)
tree4ca1d22b971a101e31cdd94bdcb9e9cbd3bfe75f /ll-merge.h
parent367ff694281ce569edd8f6e444fc770f92f5d215 (diff)
downloadgit-c261a87e704679203510d48ff4db7bc7006b8a5a.tar.gz
git-c261a87e704679203510d48ff4db7bc7006b8a5a.tar.xz
completion: add --continue option for merge
Add 'git merge --continue' option when completing. Signed-off-by: Chris Packham <judge.packham@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions