Fri, 28 Feb 2014 02:38:33 +0100 | Mads Kiilerich | merge: include ancestor node in merge actions | file | diff | annotate |
Tue, 25 Feb 2014 20:30:08 +0100 | Mads Kiilerich | merge: use ancestor filename from planning phase instead of filectx ancestor | file | diff | annotate |
Tue, 01 Apr 2014 15:11:19 -0500 | Matt Mackall | merge with stable | file | diff | annotate |
Tue, 01 Apr 2014 02:46:03 +0900 | FUJIWARA Katsunori | i18n: fix "% inside _()" problems | file | diff | annotate |
Tue, 01 Apr 2014 02:46:03 +0900 | FUJIWARA Katsunori | merge: fix lack of "%s" in format string causing TypeError at runtime | file | diff | annotate |
Fri, 28 Feb 2014 02:26:03 +0100 | Mads Kiilerich | merge: mark mergestate as dirty when resolve changes _state | file | diff | annotate |