Search found 2 matches

by HotKewlAid
Wed Aug 19, 2015 9:28 am
Forum: Support (DiffMerge)
Topic: How to prevent .orig files from being created
Replies: 3
Views: 7630

Re: How to prevent .orig files from being created

I am using Sublime Text 3 with the Sublime Git plugin for basic git commands. If there is a merge conflict I created a short cut to I can run git mergetool from my terminal window to launch your program to resolve the conflict. I am not aware of any settings available to me from the Sublime git plug...
by HotKewlAid
Tue Aug 18, 2015 10:35 am
Forum: Support (DiffMerge)
Topic: How to prevent .orig files from being created
Replies: 3
Views: 7630

How to prevent .orig files from being created

Every time I resolve a merge conflict, there are .orig files that are created in the directories that I have to manually delete. Is there a way to prevent these from being created?