From bade4c7c0398d2088e84953332761a440d9ffbfc Mon Sep 17 00:00:00 2001
From: Borek Bernard <borekb@gmail.com>
Date: Wed, 18 Jul 2018 23:05:38 +0200
Subject: [PATCH] git-merge: add --abort

---
 pages/common/git-merge.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pages/common/git-merge.md b/pages/common/git-merge.md
index abfae47a5..eaf636074 100644
--- a/pages/common/git-merge.md
+++ b/pages/common/git-merge.md
@@ -13,3 +13,7 @@
 - Merge a branch and create a merge commit:
 
 `git merge --no-ff {{branch_name}}`
+
+- Abort merge:
+
+`git merge --abort`