From d14f9f0c60e08350283ac3e15171fb996709fcae Mon Sep 17 00:00:00 2001
From: An-Cheng Huang <ancheng@vyatta.com>
Date: Tue, 20 Oct 2009 10:45:37 -0700
Subject: add .merge-branch-exclude

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

(limited to '.merge-branch-exclude')

diff --git a/.merge-branch-exclude b/.merge-branch-exclude
new file mode 100644
index 0000000..bd3b07c
--- /dev/null
+++ b/.merge-branch-exclude
@@ -0,0 +1,2 @@
+65323a34ec4c8d4e9a4e055e8f05d04097379dea
+166cbc862b9a6dfd4a9e950effff39b03f0a4abd
-- 
cgit v1.2.3