search

PNU-ButterflyEffect / anjeonmingug

2 stars 0 forks source link

resolve conflictions #17

Closed soicem closed 5 years ago

soicem commented 5 years ago

-- git mergetool 충돌났을경우 kdiff3 사용

git config --global --add merge.tool kdiff3 git config --global --add mergetool.kdiff3.path "C:/Program Files/KDiff3/kdiff3.exe" git config --global --add mergetool.kdiff3.trustExitCode false

git config --global --add diff.guitool kdiff3 git config --global --add difftool.kdiff3.path "C:/Program Files/KDiff3/kdiff3.exe" git config --global --add difftool.kdiff3.trustExitCode false

http://www.riuson.com/blog/post/git-windows-kdiff3