added .orig extension for unresolved merges

2014-07-07 12:41:47 -07:00 · 2014-07-07 12:41:47 -07:00 · 8400819cb0
parent 4566762024
commit 8400819cb0
1 changed files with 1 additions and 0 deletions
--- a/1
+++ b/1
@ -489,6 +489,7 @@ STICKY_OTHER_WRITABLE 48;5;235;38;5;139;3
 # undo files
 .pacnew               38;5;33
 .un~                  38;5;241
+.orig                 38;5;241
 # backups
 .BUP                  38;5;241
 .bak                  38;5;241