summaryrefslogtreecommitdiff
path: root/src/cnode/cnode-algorithm.cpp
diff options
context:
space:
mode:
authorMichael Larson <mike@vyatta.com>2010-11-16 09:32:02 -0800
committerMichael Larson <mike@vyatta.com>2010-11-16 09:32:02 -0800
commitc07fb9116d7fceb2046ea3caadd742dd5859f183 (patch)
tree8fec2636f83a592f86087dc2f6307ffabc9a8d67 /src/cnode/cnode-algorithm.cpp
parent32aa23a917444bd91685850d21311cdb230dabe4 (diff)
parent4528430885a7e390ee03f311f35eae7f75b589b8 (diff)
downloadvyatta-cfg-c07fb9116d7fceb2046ea3caadd742dd5859f183.tar.gz
vyatta-cfg-c07fb9116d7fceb2046ea3caadd742dd5859f183.zip
Merge branch 'mendocino' of http://git.vyatta.com/vyatta-cfg into mendocino
Diffstat (limited to 'src/cnode/cnode-algorithm.cpp')
-rw-r--r--src/cnode/cnode-algorithm.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cnode/cnode-algorithm.cpp b/src/cnode/cnode-algorithm.cpp
index c830ce4..6926c74 100644
--- a/src/cnode/cnode-algorithm.cpp
+++ b/src/cnode/cnode-algorithm.cpp
@@ -164,9 +164,9 @@ _diff_check_and_show_leaf(CfgNode *cfg1, CfgNode *cfg2, int level,
}
}
+ _diff_print_comment(cfg1, cfg2, level);
if (cfg->isMulti()) {
// multi-value node
- _diff_print_comment(cfg1, cfg2, level);
if (force_pfx_diff) {
// simple case: just use the same diff prefix for all values
const vector<string>& vvec = cfg->getValues();