tests/test-stabilize-conflict.t
2019-06-06 Anton Shestakov evolvecmd: the proper way to deal with conflicts is to resolve them
2019-06-05 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
2019-04-13 Anton Shestakov tests: add --update to hg evolve to reduce test changes for the next patch
2019-01-22 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
2018-08-21 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
2018-08-21 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
2018-08-18 Pulkit Goyal evolve: set the second parent if we get conflicts while evolving stable
2018-08-02 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
2018-08-02 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
2018-06-14 Pulkit Goyal evolve: raise error.InterventionRequired instead of Abort when conflicts
2018-06-12 Pulkit Goyal evolve: improve error messages when conflicts occur
2018-06-10 Pulkit Goyal evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted
2018-06-05 Pulkit Goyal evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
2018-04-23 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
2018-04-23 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
2018-04-22 Pierre-Yves David evolve: point to '--abort' in error message
2018-03-21 Pierre-Yves David test-compat: merge mercurial-4.3 into mercurial-4.2 mercurial-4.2
2018-03-21 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
2018-03-21 Pierre-Yves David test-compat: merge stable into mercurial-4.4 mercurial-4.4
2018-03-13 Martin von Zweigbergk tests: do not glob out fixed dates
2018-01-28 Pulkit Goyal evolve: show the updated working directory after `hg evolve --continue`
2018-01-27 Pulkit Goyal evolve: add evolve info to cmdutil.afterresolvedstates
2018-01-16 Pierre-Yves David test-compat: merge mercurial-4.3 into mercurial-4.2 mercurial-4.2
2018-01-16 Pierre-Yves David test-compat: merge stable into mercurial-4.3 mercurial-4.3
2018-01-16 Pierre-Yves David branching: merge stable back into default
2018-01-15 Pierre-Yves David branching: backed out test output changes from core-1905aac253f0 stable
2018-01-06 Pulkit Goyal evolve: don't use graftstate for continuing `hg evolve`
2018-01-05 Boris Feld test: update output to 9b3f95d9783d
2017-10-20 Pierre-Yves David test-compat: merge future 6.7.0 in mercurial-4.0 branch mercurial-4.0
2017-10-20 Pierre-Yves David test-compat: merge future 6.7.0 in mercurial-4.2 branch mercurial-4.2
less more (0) -50 -30 tip