annotate hgext/__init__.py @ 26870:ab798d1a230f

merge.mergestate: update docstrings for preresolve and resolve Add a docstring for preresolve, and update the one for resolve.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 04 Nov 2015 23:44:51 -0800
parents 7d439981bec4
children 155e3308289c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1360
7d439981bec4 Re-add hgext/__init__.py
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1 # placeholder