Skip to content

Latest commit

 

History

History
15 lines (10 loc) · 183 Bytes

index.md

File metadata and controls

15 lines (10 loc) · 183 Bytes

git gitk-conflict

Use gitk tool to show conflicting merge

Git alias:

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

Example:

git gitk-conflict