Ignore mergetool created orig files.

When merging with git, splice is creating files with the extension
.orig. I don't want to see these.
set vi editing mode in readline enabled programs

I do like my vi navigation.
Ignore mergetool created orig files.

When merging with git, splice is creating files with the extension
.orig. I don't want to see these.
set vi editing mode in readline enabled programs

I do like my vi navigation.
Merge branch 'master' into development
Merge remote-tracking branch 'origin/development' into development