Support merging with conflicts with git-drover.

man/src/git-drover.txt

Index: man/src/git-drover.txt
diff --git a/man/src/git-drover.txt b/man/src/git-drover.txt
index 98eb92d557b10841796fa9322c164f1e362b194c..a69459410ac6d7717b6afd89b865bd1c0c032738 100644
--- a/man/src/git-drover.txt
+++ b/man/src/git-drover.txt
@@ -9,7 +9,9 @@ include::_git-drover_desc.helper.txt[]
 SYNOPSIS
 --------
 [verse]
-'git drover' --branch <branch> --cherry-pick <commit>
+'git drover' --branch <branch>
+           (--cherry-pick <change> | --continue [path_to_workdir] |
+            --abort [path_to_workdir])
            [--parent_checkout <path-to-existing-checkout>]
            [--verbose] [--dry-run]
 
@@ -18,8 +20,7 @@ DESCRIPTION
 
 `git drover` applies a commit to a release branch. It creates a new workdir from
 an existing checkout to avoid downloading a new checkout without affecting the
-existing checkout. Creating a workdir requires symlinks so this does not work on
-Windows. See the EXAMPLE section for the equivalent sequence of commands to run.
+existing checkout.
 
 `git drover` does not support reverts. See the EXAMPLE section for the
 equivalent sequence of commands to run.
@@ -32,6 +33,15 @@ OPTIONS
 --cherry-pick <commit>::
   The commit to cherry-pick.
 
+--continue [path_to_workdir]::
+  Continue a cherry-pick that required manual resolution. The path to the drover
+  workdir is optional. If unspecified, the current directory is used.
+
+--abort [path_to_workdir]::
+  Abort a cherry-pick that required manual resolution and clean up its workdir.
+  The path to the drover workdir is optional. If unspecified, the current
+  directory is used.
+
 --parent_checkout::
   The path to the chromium checkout to use as the source for a creating
   git-new-workdir workdir to use for cherry-picking. If unspecified, the current
@@ -63,6 +73,10 @@ Merge Example
 ^^^^^^^^^^^^^
 demo:1[]
 
+Merge with Conflicts Example
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+demo:4[]
+
 Revert Example
 ^^^^^^^^^^^^^^
 demo:2[]