481,502d480
< declare stop_after_automatic=0
< 
< while [ $# -gt 0 ] ; do
<   case "$1" in
<    -h | --help)
<       echo "usage: etc-update [-a|--auto-only]"
<       echo "       etc-update [-h|--help]"
<       echo ""
<       echo "       -a, --auto-only   Automerges trivial changes and exits"
<       echo "       -h, --help        Prints this help"
<       exit 0
<       ;;
<    -a | --auto-only)
<       echo "Automerging trivial changes only"
<       stop_after_automatic=1
<       ;;
<    * ) 
<       die "Wrong parameters" 1
<       ;;
<   esac
<   shift
< done
506,509d483
< if [[ $stop_after_automatic -eq 1 ]]; then
<    die "No more trivial merges" 0
< fi
<