Mercurial > evolve

log tests/test-stabilize-conflict.t @ 1456:773f3edb3cb2 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Fri, 19 Jun 2015 10:44:25 -0700 Pierre-Yves David evolve: add a hint about how to abort an evolve with conflict stable
Sun, 14 Dec 2014 12:19:40 -0800 Pierre-Yves David test: adapt to core change in graft and rebase
Sat, 13 Dec 2014 18:19:12 -0800 Pierre-Yves David evolve: remove the dependency to the rebase extension stable
Mon, 17 Nov 2014 16:04:48 +0100 Pierre-Yves David test: ensure we echo prompt stable
Thu, 16 Oct 2014 04:38:37 -0700 Pierre-Yves David evolve: adapt to change in core rebase
Thu, 02 Oct 2014 15:53:54 -0500 Pierre-Yves David test: adapt to core mercurial 9ab18a912c44
Fri, 29 Aug 2014 14:26:17 +0200 David Soria Parra evolve: write a status message when the working directory changes stable
Fri, 08 Aug 2014 15:55:04 -0700 Pierre-Yves David merge with stable
Fri, 08 Aug 2014 10:40:47 -0700 Pierre-Yves David test: apply message changes introduced by mercurial 3.1 stable
Tue, 29 Jul 2014 17:15:01 -0700 Pierre-Yves David test: adapt to upstream message change
Sun, 22 Jun 2014 20:10:07 -0400 Greg Ward evolve: add --tool option so we don't have to use HGMERGE
Sat, 21 Jun 2014 18:31:21 -0400 Greg Ward tests: fix grammar, spelling, punctuation in comments
Mon, 02 Jun 2014 15:22:23 -0700 Pierre-Yves David test: update to output change introduced by future 3.1
Fri, 04 Apr 2014 00:58:15 +0200 Olle Lundberg evolve: deprecate gup and gdown aliases
Wed, 16 Oct 2013 00:37:29 +0200 Pierre-Yves David amend: use core mechanism for amend
Sat, 13 Oct 2012 16:44:14 +0200 Patrick Mezard test-stabilize-conflict.t: fix "eight" spelling stable
Sat, 13 Oct 2012 16:38:23 +0200 Patrick Mezard test-stabilize-conflict.t: sed -i is still not portable stable
Sat, 13 Oct 2012 16:31:52 +0200 Patrick Mezard test-stabilize-conflict.t: yes is not a standard shell utility stable
Tue, 11 Sep 2012 11:45:00 +0200 Pierre-Yves David evolve-cmd: fix merge error detection for external tools. stable
less more | (0) tip