modifs.mineures sans commentaires

bin/_merge82

@@ -1,4 +1,12 @@
 #!/bin/bash
 # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
+source "$(dirname -- "$0")/../load.sh" || exit 1
 
-exec "$(dirname -- "$0")/pmer" --tech-merge -Bdev82 dev74 -a "git checkout dev74" "$@"
+dev74=1
+args=(
+    "merger la branche dev74 dans la branche dev82"
+    -n,--no-dev74 dev74= "ne pas basculer sur la branche dev74 après la fusion"
+)
+parse_args "$@"; set -- "${args[@]}"
+
+exec "$MYDIR/pmer" --tech-merge -Bdev82 dev74 ${dev74:+-a "git checkout dev74"} "$@"