mercurial/merge.py
Fri, 18 Apr 2014 22:19:25 -0700 Gregory Szorc resolve: print message when no unresolved files remain (issue4214)
Fri, 18 Apr 2014 19:08:32 -0700 Gregory Szorc resolve: abort when not applicable (BC)
Thu, 08 May 2014 16:48:28 -0700 Gregory Szorc mergestate: consistently set variables to None
Wed, 30 Apr 2014 14:19:01 -0500 Matt Mackall ancestor: silence multiple ancestor warning outside of merge (issue4234) stable
Mon, 21 Apr 2014 20:24:54 +0200 Mads Kiilerich merge: improve notes for listing the bids for ambiguous merges stable
Fri, 18 Apr 2014 13:33:20 +0200 Mads Kiilerich merge: tell the user when we are using bid merge stable
less more (0) -300 -100 -30 -10 -6 tip