| Fri, 23 May 2014 13:10:31 -0700 | Siddharth Agarwal | resolve: don't abort resolve -l even when no merge is in progress | file | diff | annotate |
| Thu, 08 May 2014 16:55:56 -0700 | Durham Goode | rebase: specify custom conflict marker labels for rebase (BC) | file | diff | annotate |
| Thu, 08 May 2014 16:50:22 -0700 | Durham Goode | merge: add conflict marker formatter (BC) | file | diff | annotate |
| Fri, 09 May 2014 14:46:50 -0500 | Matt Mackall | resolve: simplify "finished" message | file | diff | annotate |
| Fri, 18 Apr 2014 22:19:25 -0700 | Gregory Szorc | resolve: print message when no unresolved files remain (issue4214) | file | diff | annotate |
| Fri, 18 Apr 2014 19:08:32 -0700 | Gregory Szorc | resolve: abort when not applicable (BC) | file | diff | annotate |
| Mon, 07 Apr 2014 23:10:20 +0200 | Mads Kiilerich | tests: make unshelve tests more tricky - don't depend on size change | file | diff | annotate |