[MERGE REVIEW] merge takes --uncommitted

[Martin Pool]

On  9 Aug 2006, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
> Aaron Bentley wrote:
> > Martin Pool wrote:
> > 
> >>>I think it'd be good to bring in, though perhaps we can unify it with
> >>>something else.  Perhaps 'merge --uncommitted'?  Obviously it doesn't
> >>>generate a merge record but in other ways it might be similar?
> > 
> > 
> > That's easy as pie.  Bundle attached.
> 
> Wrong bundle.  Here.

Thanks very much.  +1 from me, with John's comments and a couple more:

- should be an entry in the NEWS

- because this adds a new user-visible feature, I'd like there to be at
  least a stub in the manual describing it.  Then if someone is
  polishing up the manual at least they will remember they have to explain
  it, and in the mean time it'll at least give people a clue where to
  look.

With those, please merge.
-- 
Martin