Recall that the commit which will be commited after we resolve this
Recall that the commit which will be committed after we resolve this
conflict will have two parents instead of the usual one: one parent
will be HEAD, the tip of the current branch; the other will be the
tip of the other branch, which is stored temporarily in MERGE_HEAD.
@ -1351,7 +1351,7 @@ away, you can always return to the pre-merge state with
@@ -1351,7 +1351,7 @@ away, you can always return to the pre-merge state with
$ git reset --hard HEAD
-------------------------------------------------
Or, if you've already commited the merge that you want to throw away,
Or, if you've already committed the merge that you want to throw away,