Add no .orig from mergetool config