CVSROOT: /cvs Module name: src Changes by: [email protected] 2010/01/26 04:31:08
Modified files:
usr.sbin/pkg_add: pkg_add
Log message:
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 ;)
