Skip to content

Commit

Permalink
Git: Discard *.orig after running git-mergetool(1)
Browse files Browse the repository at this point in the history
  • Loading branch information
tommystanton committed Dec 1, 2015
1 parent 3bd4cc4 commit df64ea9
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .gitconfig
Expand Up @@ -24,3 +24,5 @@
textconv = odt2txt
[diff "doc"]
textconv = catdoc
[mergetool]
keepBackup = false

0 comments on commit df64ea9

Please sign in to comment.