Support merging with conflicts with git-drover.

man/src/git-drover.demo.4.sh

Index: man/src/git-drover.demo.4.sh
diff --git a/man/src/git-drover.demo.1.sh b/man/src/git-drover.demo.4.sh
similarity index 55%
copy from man/src/git-drover.demo.1.sh
copy to man/src/git-drover.demo.4.sh
index 9b12e380f64cb16bf5ff8279fbbd3097ced6acf6..2e36330dd1d0518b868019735e72e95598391382 100755
--- a/man/src/git-drover.demo.1.sh
+++ b/man/src/git-drover.demo.4.sh
@@ -16,6 +16,23 @@ output git log -n 1
 echo '"""'
 echo "to 9999. Continue (y/n)? y"
 echo
+echo "Error: Patch failed to apply."
+echo
+echo "A workdir for this cherry-pick has been created in"
+echo "  /tmp/drover_9999"
+echo
+echo "To continue, resolve the conflicts there and run"
+echo "  git drover --continue /tmp/drover_9999"
+echo
+echo "To abort this cherry-pick run"
+echo "  git drover --abort /tmp/drover_9999"
+echo
+pcommand pushd /tmp/drover_9999
+echo "# Manually resolve conflicts."
+pcommand git add path/to/file_with_conflicts
+pcommand popd
+pcommand git drover --continue /tmp/drover_9999
+echo
 echo "# A cl is uploaded to rietveld, where it can be reviewed before landing."
 echo
 echo "About to land on 9999. Continue (y/n)? y"