Fix merge abort command being wrong - Thanks Fersu

6 years ago · bbfdeaaccc
parent 586efd2167
commit bbfdeaaccc
1 changed files with 1 additions and 1 deletions
--- a/README.md
+++ b/README.md
@ -401,7 +401,7 @@ We _stage_ them when we `add Bob.txt`, and then we `commit`.

 We already know the commit for the changes we've made to resolve the conflict. It's the _merge commit_ that is always present when merging. 

-Should you ever realize in the middle of resolving conflicts that you actually don't want to follow through with the `merge`, you can just `abort` it by running `git commit --abort`. 
+Should you ever realize in the middle of resolving conflicts that you actually don't want to follow through with the `merge`, you can just `abort` it by running `git merge --abort`. 

 ## Rebasing