| Wed, 16 Sep 2015 12:36:21 -0700 | Siddharth Agarwal | merge: move merge step to the end | file | diff | annotate |
| Sat, 08 Aug 2015 19:41:25 -0700 | Gregory Szorc | merge: use absolute_import | file | diff | annotate |
| Thu, 25 Jun 2015 17:54:55 -0500 | Matt Mackall | merge: make merge.preferancestor type and default consistent | file | diff | annotate |