commit 3a975b8cfcbe026b535f83bde9a3c009bae214f9
author Masahiro Yamada <yamada.masahiro@socionext.com> Fri Mar 13 15:21:41 2015 +0900
committer Michal Marek <mmarek@suse.cz> Tue Mar 24 16:48:44 2015 +0100
tree f15341a6f0f32da859fa202ecb73fda5194ba65c
parent 371cfd4ff0611d8bc5d18bbb9cc6a2bc3d56cd3d

merge_config.sh: improve indentation

It is true that we do not want to move the code too far to the
right, but something like below is not preferred:

    if [ "x$PREV_VAL" != "x$NEW_VAL" ] ; then
    echo Value of $CFG is redefined by fragment $MERGE_FILE:
    echo Previous  value: $PREV_VAL
    echo New value:       $NEW_VAL
    echo
    elif [ "$WARNREDUN" = "true" ]; then
    echo Value of $CFG is redundant by fragment $MERGE_FILE:
    fi

To fix this, call "continue" if the "grep" command fails to find the
given CONFIG.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>