From 9225a7b2d5966d50e5eff502e167229396c0ca01 Mon Sep 17 00:00:00 2001
From: Borek Bernard <borekb@gmail.com>
Date: Thu, 19 Jul 2018 09:57:28 +0200
Subject: [PATCH] git-merge: --abort mentions that it's for situations with
 conflicts

---
 pages/common/git-merge.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/common/git-merge.md b/pages/common/git-merge.md
index eaf636074..ad1f212f4 100644
--- a/pages/common/git-merge.md
+++ b/pages/common/git-merge.md
@@ -14,6 +14,6 @@
 
 `git merge --no-ff {{branch_name}}`
 
-- Abort merge:
+- Abort a merge in case of conflicts:
 
 `git merge --abort`