diff --git a/doc/release-process.md b/doc/release-process.md
index 3eff53e..20055c3 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -21,3 +21,5 @@ git merge --no-ff -X theirs master
 
 The last command uses the "theirs" merge strategy option to the "recursive" merge strategy, which is default. See "git help merge" for more details.
 
+If you have a messed up merge or you don't want to deal with conflicts right now, you can do `git merge --abort` to cancel a merge.
+