X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=.hgignore;h=1f6ec646e722965f0de0db21028e8db40859659c;hb=8d0cd77fc7bafd1f353bc7c50910b751766f931a;hp=ff7c01f6803024c072e6a951de3a5ec64dd90546;hpb=706d1aa082fee61f2f69827d3bfe143f926e2074;p=m6w6%2Flibmemcached

diff --git a/.hgignore b/.hgignore
index ff7c01f6..1f6ec646 100644
--- a/.hgignore
+++ b/.hgignore
@@ -20,3 +20,6 @@ Makefile(.in)?$
 # Generated man files
 \.1$
 \.3$
+
+# Merged files
+\.orig$