ajout _merge2php82

_merge2php82

@@ -0,0 +1,25 @@
+#!/bin/bash
+# -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
+mydir="$(cd "$(dirname -- "$0")"; pwd)"
+myself="$mydir/$(basename -- "$0")"
+cwd="$(pwd)"
+if [ "$1" != --stage2 -o -z "$2" ]; then
+    cp "$myself" /tmp/merge2php82.sh
+    exec /tmp/merge2php82.sh --stage2 "$mydir"
+fi
+
+cd "$2" || die
+if [ -f vendor/nulib/php/load.sh ]; then
+    source ./vendor/nulib/php/load.sh || exit 1
+else
+    source /etc/nulib.sh || exit 1
+fi
+
+git checkout php82
+git rebase master ||
+    die "Le rebase automatique a échoué. Après avoir résolu les conflits, faire
+    git checkout master
+    pp -af
+"
+git checkout master
+pp -af