From 49c4ef7c568168405d3b867a3e8f814b9c6bf95e Mon Sep 17 00:00:00 2001
From: Alex Young <alex@bytemark.co.uk>
Date: Thu, 31 May 2012 13:55:35 +0100
Subject: [PATCH] Add .orig merge files to .hgignore

---
 .hgignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgignore b/.hgignore
index 1b4b5a4..b254ad8 100644
--- a/.hgignore
+++ b/.hgignore
@@ -3,3 +3,4 @@
 ^flexnbd$
 ^build/
 ^pkg/
+\.orig$