diff options
| -rwxr-xr-x | scripts/automerge7.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/automerge7.sh b/scripts/automerge7.sh index 935604fb5d..2b98530902 100755 --- a/scripts/automerge7.sh +++ b/scripts/automerge7.sh @@ -96,7 +96,7 @@ for commit in $pending do echo "Checking $commit..." mergeDirective=`git log -n 1 --format=%B $commit|grep "^Merge:"|sed "s/Merge: //"` - commitMsg=`git log -n 1 --format=oneline --abbrev-commit $commit` + commitMsg=`git log -n 1 --format=oneline --abbrev-commit $commit | sed 's/\\\\/\\\\\\\\/g'` #Multiple levels of unescaping, sed just changes \ to \\ if [ "$mergeDirective" == "" ] then if can_merge $commit |