Name		Name	Last commit message	Last commit date
parent directory ..
README.md		README.md
index.md		index.md

README.md

git gitk-conflict

Use gitk tool to show conflicting merge

Git alias:

gitk-conflict = !gitk --left-right HEAD...MERGE_HEAD

Example:

git gitk-conflict