[MERGE] auto-resolve for commit

[Matthew D. Fuller]

On Mon, Nov 06, 2006 at 01:41:34AM -0500 I heard the voice of
Aaron Bentley, and lo! it spake thus:
> 
> So here's auto_resolve.

+1 on the concept, having jumped that hoop about 4 times last night.
Maybe this should also be hooked into a "{resolve,conflicts} --check"
or the like?


-- 
Matthew Fuller     (MF4839)   |  fullermd at over-yonder.net
Systems/Network Administrator |  http://www.over-yonder.net/~fullermd/
           On the Internet, nobody can hear you scream.