log tests/test-rebase-conflicts.t @ 23442:a5c94ea3b8af

age author description
Sat, 26 Jul 2014 03:32:49 +0200 Pierre-Yves David resolve: add parenthesis around "no more unresolved files" message stable
Tue, 22 Apr 2014 02:10:25 +0200 Mads Kiilerich merge: change debug logging - test output changes but no real changes
Fri, 09 May 2014 14:46:50 -0500 Matt Mackall resolve: simplify "finished" message
Fri, 18 Apr 2014 22:19:25 -0700 Gregory Szorc resolve: print message when no unresolved files remain (issue4214)
Sat, 15 Feb 2014 01:23:12 +0100 Mads Kiilerich rebase: fix 'rebase onto %d starting from %s' - show root instead of list repr
Fri, 22 Nov 2013 19:14:17 +0100 Martin Geisler tests: don't load unnecessary graphlog extension
Wed, 30 Oct 2013 19:45:14 +0100 Pierre-Yves David rebase: fix selection of base used when rebasing merge (issue4041) stable
Fri, 08 Feb 2013 16:17:46 -0600 Augie Fackler dispatch: exit with status 1 for an InterventionRequired exception (bc)
Fri, 08 Feb 2013 16:27:59 -0600 Augie Fackler rebase: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Mon, 11 Mar 2013 15:37:28 -0700 Durham Goode rebase: restore active bookmark after rebase --continue stable
Wed, 08 Aug 2012 18:10:16 +0200 Mads Kiilerich check-code: fix check for trailing whitespace on sh command lines
Mon, 11 Jun 2012 01:40:51 +0200 Mads Kiilerich tests: add missing trailing 'cd ..'
Tue, 17 Jan 2012 09:12:14 +0100 Alain Leufroy rebase: fix phases movement
Tue, 27 Dec 2011 00:11:22 +0100 Pierre-Yves David phases: prevent rebase to rebase immutable changeset.
Wed, 16 Nov 2011 18:04:19 -0600 Matt Mackall merge: give a special message for internal:merge failure (issue3105)
Sun, 06 Mar 2011 15:21:50 +0100 Patrick Mezard Improve unresolved merge conflicts warning (issue2681) stable
Sat, 30 Oct 2010 16:58:15 -0500 Steve Borho rebase: improve resolve failure message stable
Fri, 08 Oct 2010 22:36:10 -0500 Mads Kiilerich tests: remove redundant globs
Fri, 01 Oct 2010 16:10:06 +0200 Adrian Buehlmann tests: unify test-rebase* base tests/test-rebase-conflicts@5dc62e6e2295