diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2010-01-26 11:31:09 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2010-01-26 11:31:09 +0000 |
| commit | fc600a0e46afd4a2a1555de7e774071e230d0bf5 (patch) | |
| tree | 2c13ec978bbec4ccb7ac03aee86cf97b7879fa48 /etc/rc | |
| parent | 18e19fbb4c5a909cd8e857f50e5e8a101ee2c98e (diff) | |
fix merging behavior when merging doesn't occur:
- display message that says "this update didn't merge"
- be more specific in return values, because we want to distinguish between
we merged some stuff -> compute full depends / we didn't -> proceed
thanks to Florent Tribouilloy for being my guinea pig ;)
Diffstat (limited to 'etc/rc')
0 files changed, 0 insertions, 0 deletions