git-imerge: add "abort" example (#1339)

2017-04-21 10:45:54 +01:00
parent 9475cd3589
commit df46736db7
1 changed files with 5 additions and 1 deletions
--- a/pages/common/git-imerge.md
+++ b/pages/common/git-imerge.md
@@ -19,6 +19,10 @@

 `git imerge continue --no-edit`

- Wrap up the imerge operation, after all conflicts are resolved:
+- Wrap up imerge operation, after all conflicts are resolved:

 `git imerge finish`
+
+- Abort imerge operation, and return to the previous branch:
+
+`git-imerge remove && git checkout {{previous_branch}}`