mercurial/merge.py
Mon, 06 Sep 2010 17:35:49 +0200 Peter Arrenbrecht merge: delay writing the mergestate during until commit is called
Tue, 14 Sep 2010 12:20:51 +0200 Adrian Buehlmann combine tests
Wed, 25 Aug 2010 16:23:32 +0200 Martin Geisler util: remove lexists, Python 2.4 introduced os.path.lexists
Sat, 21 Aug 2010 10:48:49 -0500 Matt Mackall merge with stable
Sat, 21 Aug 2010 10:41:29 -0500 Matt Mackall merge: move reverse-merge logic out of filemerge (issue2342) stable
Wed, 11 Aug 2010 20:16:22 +0800 Alecs King merge: fix typo in docstring
less more (0) -100 -30 -10 -6 tip