summaryrefslogtreecommitdiff
path: root/.merge-branch-exclude
diff options
context:
space:
mode:
authorAn-Cheng Huang <ancheng@vyatta.com>2009-10-20 10:45:37 -0700
committerAn-Cheng Huang <ancheng@vyatta.com>2009-10-20 10:45:37 -0700
commitd14f9f0c60e08350283ac3e15171fb996709fcae (patch)
tree4fef1e336fdc2cef183d4186b8eb50e8919afaa6 /.merge-branch-exclude
parent6ad3009f947622a5ecfd93e485c2abd6a3fd7aa1 (diff)
downloadvyatta-op-d14f9f0c60e08350283ac3e15171fb996709fcae.tar.gz
vyatta-op-d14f9f0c60e08350283ac3e15171fb996709fcae.zip
add .merge-branch-exclude
Diffstat (limited to '.merge-branch-exclude')
-rw-r--r--.merge-branch-exclude2
1 files changed, 2 insertions, 0 deletions
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