[PATCH 4 of 5 changedelete] merge.mergestate: update docstrings for preresolve and resolve

[Siddharth Agarwal]

# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1446709491 28800
#      Wed Nov 04 23:44:51 2015 -0800
# Node ID 7514e2e35e70661a7783668cf9cddd949ab9cd76
# Parent  14056ae3782ddc3fee4b4bb0b9557aa463e08f3c
merge.mergestate: update docstrings for preresolve and resolve

Add a docstring for preresolve, and update the one for resolve.

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -397,10 +397,15 @@ class mergestate(object):
         return complete, r
 
     def preresolve(self, dfile, wctx, labels=None):
+        """run premerge process for dfile
+
+        Returns whether the merge is complete, and the exit code."""
         return self._resolve(True, dfile, wctx, labels=labels)
 
     def resolve(self, dfile, wctx, labels=None):
-        """rerun merge process for file path `dfile`"""
+        """run merge process (assuming premerge was run) for dfile
+
+        Returns the exit code of the merge."""
         return self._resolve(False, dfile, wctx, labels=labels)[1]
 
 def _checkunknownfile(repo, wctx, mctx, f, f2=None):