summaryrefslogtreecommitdiff
path: root/.merge-branch-exclude
diff options
context:
space:
mode:
authorAn-Cheng Huang <ancheng@vyatta.com>2009-10-14 12:00:12 -0700
committerAn-Cheng Huang <ancheng@vyatta.com>2009-10-14 12:00:12 -0700
commit1e4f250d407fb060604f8c35732b568f61c41ef0 (patch)
treeea6e8d583cf38913365fcd6e0387245b47dc4609 /.merge-branch-exclude
parent4fab4da60f5c80ca3aa5b59f6e9e6922da2b0ecb (diff)
downloadvyatta-cfg-system-1e4f250d407fb060604f8c35732b568f61c41ef0.tar.gz
vyatta-cfg-system-1e4f250d407fb060604f8c35732b568f61c41ef0.zip
add .merge-branch-exclude
Diffstat (limited to '.merge-branch-exclude')
-rw-r--r--.merge-branch-exclude1
1 files changed, 1 insertions, 0 deletions
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