Tip - Git mergetool generates unwanted .orig files

Published  | Submitted by Agent Soderlund
Git mergetool generates unwanted .orig files

When I do a merge conflict resolution with Kdiff3 (and other merge tool I tried) I noticed that on resolution a *.orig file is created. Is there a way for it to not create that extra file?

About Author

More by Agent Soderlund

About This Tip

Posted: 9 years, 4 month(s) ago

126 Reads
0 Votes