diff options
| author | Mohit Mehta <mohit@vyatta.com> | 2011-01-04 17:48:24 -0800 |
|---|---|---|
| committer | Mohit Mehta <mohit@vyatta.com> | 2011-01-04 17:48:24 -0800 |
| commit | 7b6c0d6c8a9f0ce65038a1f29192f097f7387af4 (patch) | |
| tree | c0241c49fa667a2d94e4009fa401935a34705adc | |
| parent | 2d229a7f81398702c40c2e721aed305f62a3c3d3 (diff) | |
| download | vyatta-cfg-quagga-7b6c0d6c8a9f0ce65038a1f29192f097f7387af4.tar.gz vyatta-cfg-quagga-7b6c0d6c8a9f0ce65038a1f29192f097f7387af4.zip | |
skip 'new branch' commit from mendocino when using merge-branch
| -rw-r--r-- | .merge-branch-exclude | 1 |
1 files changed, 1 insertions, 0 deletions
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 |