Lines 512-518
Link Here
|
512 |
exit; |
512 |
exit; |
513 |
} |
513 |
} |
514 |
my @targets = (); |
514 |
my @targets = (); |
515 |
my @sandbox_pids = qx{ps --no-header -o pid -C sandbox}; |
515 |
my @sandbox_pids = qx{ps --no-header -o pid -C sandbox | sed 's/ //'}; |
516 |
if (scalar @sandbox_pids == 0) { |
516 |
if (scalar @sandbox_pids == 0) { |
517 |
print colored("!!!", $COLORS{'red'}); |
517 |
print colored("!!!", $COLORS{'red'}); |
518 |
print " Error: no working merge found.\n"; |
518 |
print " Error: no working merge found.\n"; |