From 8400819cb0420bf218a47b3243dbbff43d033bcb Mon Sep 17 00:00:00 2001
From: Ryan Delaney <ryan.delaney@gmail.com>
Date: Mon, 7 Jul 2014 12:41:47 -0700
Subject: [PATCH] added .orig extension for unresolved merges

---
 LS_COLORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/LS_COLORS b/LS_COLORS
index 9fbd092..8234bf7 100644
--- a/LS_COLORS
+++ b/LS_COLORS
@@ -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