From 7b6c0d6c8a9f0ce65038a1f29192f097f7387af4 Mon Sep 17 00:00:00 2001
From: Mohit Mehta <mohit@vyatta.com>
Date: Tue, 4 Jan 2011 17:48:24 -0800
Subject: skip 'new branch' commit from mendocino when using merge-branch

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

diff --git a/.merge-branch-exclude b/.merge-branch-exclude
index 8518e4e8..26a5e982 100644
--- a/.merge-branch-exclude
+++ b/.merge-branch-exclude
@@ -8,3 +8,4 @@ c6b895817534113809c11c85d236d3170152df4f
 1cb034ae31da409a541b2275f8a8ba45e9434f9f
 3c6142ffeefc1575cfa5c0a370887c2eb0784b57
 a2e34c14b26ed7536f7068241a48cdd5d36e29d1
+b0d74d951ac50ab7b5d15913331f79f2c8518286
-- 
cgit v1.2.3