Skip to content

Commit

Permalink
Update README.md
Browse files Browse the repository at this point in the history
  • Loading branch information
wulfland authored Nov 28, 2024
1 parent b94ae2a commit 7b553bd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ Create a merge conflict with `git merge main` and resolve it.
$ git merge --abort
$ git diff
$ git log --merge –p <filename>
$ git show :1:<filename> (common anchestor)
$ git show :1:<filename> (common ancestor)
$ git show :2:<filename> (HEAD)
$ git show :3:<filename> (MERGE_HEAD)

Expand Down

0 comments on commit 7b553bd

Please sign in to comment.