# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1446709491 28800
# Node ID ab798d1a230f58d38b4d541527fda4e47aa8eae0
# Parent  412e8c5e38b4a4fcb49474cee8fe3d9c1e4715d3
merge.mergestate: update docstrings for preresolve and resolve

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

diff -r 412e8c5e38b4 -r ab798d1a230f mercurial/merge.py
--- a/mercurial/merge.py	Mon Oct 26 02:35:48 2015 -0700
+++ b/mercurial/merge.py	Wed Nov 04 23:44:51 2015 -0800
@@ -395,10 +395,15 @@
         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):