equal
deleted
inserted
replaced
4257 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The |
4257 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The |
4258 default is to mark all resolved files. |
4258 default is to mark all resolved files. |
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 |
4265 Mercurial will not let you commit files with unresolved merge |
4267 Mercurial will not let you commit files with unresolved merge |
4266 conflicts. You must use :hg:`resolve -m ...` before you can |
4268 conflicts. You must use :hg:`resolve -m ...` before you can |