log mercurial/merge.py @ 8518:3f4f14eab085

age author description
Tue, 19 May 2009 03:59:58 +0200 Benoit Boissinot update --clean: do not unlink added files (issue575)
Wed, 13 May 2009 14:08:39 +0200 Dirkjan Ochtman some modernization cleanups, forward compatibility
Tue, 28 Apr 2009 17:40:46 +0200 Simon Heimberg separate import lines from mercurial and general python modules
Thu, 30 Apr 2009 10:15:32 -0500 Steve Borho ui: replace regexp pattern with sequence of choices
Sun, 26 Apr 2009 01:08:54 +0200 Martin Geisler updated license to be explicit about GPL version 2
Wed, 22 Apr 2009 00:57:28 +0200 Martin Geisler replace set-like dictionaries with real sets
Wed, 22 Apr 2009 02:01:22 +0200 Ronny Pfannschmidt switch lock releasing in the core from gc to explicit
Mon, 16 Mar 2009 16:58:41 -0500 Matt Mackall resolve: move reset to localrepo.commit
Sun, 15 Feb 2009 10:50:48 -0600 Matt Mackall merge: mark kept local files as readded on linear update (issue539)
Tue, 13 Jan 2009 23:17:19 +0100 Patrick Mezard Merge with crew-stable
Tue, 13 Jan 2009 22:41:06 +0100 Patrick Mezard merge: fix execute bit update issue introduced by 89207edf3973
Mon, 12 Jan 2009 09:16:03 +0100 Dirkjan Ochtman use dict.iteritems() rather than dict.items()
Wed, 07 Jan 2009 02:11:17 +0100 Benoit Boissinot correctly update dirstate after update+mode change (issue1456)
Wed, 08 Oct 2008 16:22:08 -0500 Matt Mackall merge: fix bug going backwards for already reverted files (issue1303)