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`