mercurial/merge.py
Fri, 09 Dec 2011 17:34:53 +0100 Martin Geisler merge: make debug output easier to read
Wed, 07 Dec 2011 11:23:01 -0600 Kevin Bullock merge: make 'nothing to merge' aborts consistent
Sun, 20 Nov 2011 23:09:32 +0100 Mads Kiilerich update: don't clobber untracked files with wrong casing stable
Wed, 17 Aug 2011 14:11:46 +0200 Martin Geisler merge: use repo.ui directly instead local variable
Thu, 28 Jul 2011 14:36:07 +0900 FUJIWARA Katsunori i18n: use UTF-8 string to lower filename for case collision check stable
Fri, 17 Jun 2011 15:21:02 -0500 Augie Fackler update: check wc.dirty() before setting overwrite=True
less more (0) -300 -100 -30 -10 -6 tip