Show More
@@ -4259,6 +4259,8 b' def resolve(ui, repo, *pats, **opts):' | |||||
4259 |
|
4259 | |||
4260 | - :hg:`resolve -l`: list files which had or still have conflicts. |
|
4260 | - :hg:`resolve -l`: list files which had or still have conflicts. | |
4261 | In the printed list, ``U`` = unresolved and ``R`` = resolved. |
|
4261 | In the printed list, ``U`` = unresolved and ``R`` = resolved. | |
|
4262 | You can use ``set:unresolved()`` or ``set:resolved()`` to filter | |||
|
4263 | the list. See :hg:`help filesets` for details. | |||
4262 |
|
4264 | |||
4263 | .. note:: |
|
4265 | .. note:: | |
4264 |
|
4266 |
General Comments 0
You need to be logged in to leave comments.
Login now