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