log mercurial/merge.py @ 10496:45734b51c99b stable

age author description
Wed, 17 Feb 2010 15:43:21 +0100 Sune Foldager run commit and update hooks after command completion (issue1827) stable
Sun, 07 Feb 2010 17:44:30 -0600 Augie Fackler update: make calls to ui.progress()
Mon, 25 Jan 2010 00:05:27 -0600 Matt Mackall many, many trivial check-code fixups
Tue, 19 Jan 2010 22:20:08 -0600 Matt Mackall Update license to GPLv2+ stable
Sun, 08 Nov 2009 10:29:52 -0600 Matt Mackall submerge: properly deal with overwrites
Sat, 07 Nov 2009 16:30:42 -0600 Matt Mackall subrepo: notice dirty subrepo states when merging
Thu, 05 Nov 2009 10:53:59 +0100 Stuart W Marks update: allow branch crossing without -c or -C, with no uncommitted changes