mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-30 12:21:25 -08:00
* admin/automerge (merge): Report no. of commits if too few.
This commit is contained in:
parent
3267763e6b
commit
041c8c4c5d
1 changed files with 1 additions and 3 deletions
|
|
@ -161,10 +161,8 @@ merge ()
|
|||
return 0
|
||||
|
||||
else
|
||||
grep -qE "Nothing to merge|Number of missing commits" $tempfile && {
|
||||
echo "Fewer than $nmin commits to merge"
|
||||
grep -E "Nothing to merge|Number of missing commits" $tempfile && \
|
||||
exit 0
|
||||
}
|
||||
|
||||
cat "$tempfile" 1>&2
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue