Browse Source

git-merge: --abort mentions that it's for situations with conflicts

Borek Bernard 6 years ago
parent
commit
9225a7b2d5
1 changed files with 1 additions and 1 deletions
  1. 1 1
      pages/common/git-merge.md

+ 1 - 1
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`