kdiff3
참조
[git] merge tool setting. kdiff3