From 1e4f250d407fb060604f8c35732b568f61c41ef0 Mon Sep 17 00:00:00 2001
From: An-Cheng Huang <ancheng@vyatta.com>
Date: Wed, 14 Oct 2009 12:00:12 -0700
Subject: add .merge-branch-exclude

---
 .merge-branch-exclude | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .merge-branch-exclude

diff --git a/.merge-branch-exclude b/.merge-branch-exclude
new file mode 100644
index 00000000..3c52dbd4
--- /dev/null
+++ b/.merge-branch-exclude
@@ -0,0 +1 @@
+47f054cb196959bb79960f3b6c1524b4ff7d32a8
-- 
cgit v1.2.3