First, a patch that updates "help mark-conflicts" to reflect the new
conflict marking (that includes initial state).

Then, two patches that tidy up documentation and tests by removing
mentions to "darcs resolve" (the old name of darcs mark-conflicts).

Finally, a patch that simply removes the "darcs resolve" alias,
because I believe it does not make sense at all and may misguide
users.

This last patch is why I am not screening this bundle, I'd like
to have someone else to approve this, in case I'm removing something
I shouldn't.


A little bit of history:

- an old WTF with regards to resolve (2006)
  http://www.mail-archive.com/darcs-users@darcs.net/msg01922.html

- the patch that renamed resolve to makr-conflicts:
  Tue Jul 17 00:56:35 CEST 2007  Eric Kow
    * Rename resolve to mark-conflicts (issue113).

Guillaume


4 patches for repository http://darcs.net/screened:

Wed Apr  6 12:57:13 CEST 2011  Guillaume Hoffmann <guillaumh@gmail.com>
  * update help string for mark-conflicts
  reflects new conflict marking, and remove mention to resolve alias

Wed Apr  6 13:04:53 CEST 2011  Guillaume Hoffmann <guillaumh@gmail.com>
  * remove mention of darcs resolve in manual

Wed Apr  6 13:05:10 CEST 2011  Guillaume Hoffmann <guillaumh@gmail.com>
  * remove mentions of darcs resolve in two tests

Wed Apr  6 13:08:48 CEST 2011  Guillaume Hoffmann <guillaumh@gmail.com>
  * remove darcs resolve alias for mark-conflicts

Attachments

• unnamed
• unnamed
• update-help-string-for-mark_conflicts.dpatch

I've applied this.  I was unsure about removing the resolve alias, but 
Guillaume points out that it could trip up SVN users (svn resolve).  
Thanks!