--- etc-update	2006-12-25 16:26:49.000000000 +0100
+++ /usr/sbin/etc-update	2006-12-25 15:50:56.000000000 +0100
@@ -478,35 +478,9 @@
 declare -i count=0
 declare input=0
 declare title="Gentoolkit's etc-update tool!"
-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
 
 scan
 
-if [[ $stop_after_automatic -eq 1 ]]; then
-   die "No more trivial merges" 0
-fi
-
 until (( ${input} == -1 )); do
 	if (( ${count} == 0 )); then
 		die "Nothing left to do; exiting. :)" 0