diff options
Diffstat (limited to 'admin')
| -rwxr-xr-x | admin/automerge | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/admin/automerge b/admin/automerge index 76c1596f3fa..ba608d10904 100755 --- a/admin/automerge +++ b/admin/automerge | |||
| @@ -161,10 +161,8 @@ merge () | |||
| 161 | return 0 | 161 | return 0 |
| 162 | 162 | ||
| 163 | else | 163 | else |
| 164 | grep -qE "Nothing to merge|Number of missing commits" $tempfile && { | 164 | grep -E "Nothing to merge|Number of missing commits" $tempfile && \ |
| 165 | echo "Fewer than $nmin commits to merge" | ||
| 166 | exit 0 | 165 | exit 0 |
| 167 | } | ||
| 168 | 166 | ||
| 169 | cat "$tempfile" 1>&2 | 167 | cat "$tempfile" 1>&2 |
| 170 | 168 | ||