On Sat, Apr 26, 2003 at 03:46:08PM -0700, Doug Barton wrote: > We're also starting to see some confusion on the part of users about > having both systems on disk. Time to teach mergemaster about files that are now stale, so it can offer to remove (or archive) them for the user? J