summaryrefslogtreecommitdiff
path: root/.merge-branch-exclude
diff options
context:
space:
mode:
authorMohit Mehta <mohit.mehta@vyatta.com>2010-08-27 11:34:46 -0700
committerMohit Mehta <mohit.mehta@vyatta.com>2010-08-27 11:34:46 -0700
commita8196d0b2fb3bf521486d6e5e35a1cfa47cc599d (patch)
treee1d8306144258cece9de1920c024585690ea2518 /.merge-branch-exclude
parentcfa746fb0d41a70843a851561136dc003745f14f (diff)
downloadvyatta-cfg-a8196d0b2fb3bf521486d6e5e35a1cfa47cc599d.tar.gz
vyatta-cfg-a8196d0b2fb3bf521486d6e5e35a1cfa47cc599d.zip
commits that don't need to be ported to mendocino from larkspur to exclude file
Diffstat (limited to '.merge-branch-exclude')
-rw-r--r--.merge-branch-exclude4
1 files changed, 4 insertions, 0 deletions
diff --git a/.merge-branch-exclude b/.merge-branch-exclude
new file mode 100644
index 0000000..461c816
--- /dev/null
+++ b/.merge-branch-exclude
@@ -0,0 +1,4 @@
+6521907e2deb6b13a9048334d70657a2c4f12b73
+fdcf5294b4a60c2a1a75e40442cb09b58e470885
+4935b31eb6b6c755f7ce3e0102a60996c1b1d633
+