A new plea for merging while you have outstanding committed changes

[Dirkjan Ochtman]

On Sat, Aug 7, 2010 at 00:00, Matt Mackall <mpm at selenic.com> wrote:
> $ hg09 help merge
> hg merge [-b TAG] [-f] [REV]
>
> Merge working directory with another revision
>
>    Merge the contents of the current working directory and the
>    requested revision. Files that changed between either parent are
>    marked as changed for the next commit and a commit must be
>    performed before any further updates are allowed.
>
> options:
>
>  -b --branch  merge with head of a specific branch
>  -f --force   force a merge with outstanding changes
>
> The -f flag for merge goes back before it was named merge.

This is about the commit after merge, not merge itself, I think.

Cheers,

Dirkjan