Mercurial > evolve
view .hgtags @ 1395:362e2c8c5677 stable
evolve: add a hint about how to abort an evolve with conflict
The whole evolve --continue is hacky, but the way to abort it have been arcane
knowledge, carried from sith lord to its apprentice for centuries. We add a hint
to help the use discover it.
One day a clean solution will come.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Fri, 19 Jun 2015 10:44:25 -0700 |
parents | 2da7b531879a |
children | e8f875227901 |
line wrap: on
line source
6c6bb7a23bb5125bf06da73265f039dd3447dafa 0.1.0 d3f20770b86a31dba56ae7b252089e12b34702da 0.2.0 c046b083a5e0b21af69027f31cee141800cf894b 0.3.0 9bbcd274689829d9239978236e16610688978233 0.4.0 4ecbaec1d664b1e6f8ebc78292e1ced77a8e69c0 0.4.1 7ef8ab8c6feadb8a9d9e13af144a17cb23e9a38d 0.5 4a5488c01a66be4729252175cea0ea739a88a540 0.6 18a0d96ed559089edf90206c469f3f8c26681c64 0.7 18a0d96ed559089edf90206c469f3f8c26681c64 0.7 1b2757c1bd918509184f6c1d06b2329a847e31b0 0.7 b18b000363550f02f413aed008f8e306318c608c 1.0.0 ca5bb72d14aeb6e6053e3a53c064a2b7dc8010e5 1.0.1 b1bdcb4506defef0e857e2710633f7686d8034a5 1.0.2 5559e5a4b656978c592d364f242edc62369d7e84 1.0.2 c062edbcaf13135d0312fd2039deca74573ff4f0 1.1.0 22cacfce2a65ab965c6179ae862b148f4abc7d8a 1.1.0 d43e80504e55db9ad4826e860e50530103a27b0f 2.0.0 f9d305deeff3dba782e65faf4ef3fd1569995859 2.1.0 862b6b71a35836e81f090ba7229c2888e8ed2f9f 3.0.0 cdb52bbbe5b8770d5e68943b7e73bee4ba136ecc 3.1.0 c3ba8a965a7a173e388d84819e936ea9bae9797f 3.2.0 83882f2fbecba0b7e7f7e5d490b57db93bd7fa22 3.3.0 fc04758ea9f549684989ee673b04d9724756dc85 3.3.1 a03ea39aca2a66ea36817512d586dcbc99dbfe9b 3.3.2 0304fc2bab158658df53a8f4edd5aa300a9497d2 4.0.0 e914884fb7210d6350d94909cb25ebc602359680 4.0.1 4d5d101e878f6d6264a8e036b11afdf922c4ef94 4.1.0 c13b408c00066af78cda88734909c6f2f3505f76 5.0.0 51e1e962172c0178394cd36652d90181319f5416 5.0.1 51e1e962172c0178394cd36652d90181319f5416 5.0.1 0f30907852831f818bd0d01141b4ab7d8d71b821 5.0.1 dbd0733e584073d6a7b6dea933767853e9cfe845 5.0.2 bfe9be352453640233371cc7deb409a09decacf9 5.1.0 9b8628e0a142e0e094e27430c388e3c12ceba513 5.1.1 e886bc501796d53e0a19e608c6e5a6071191819e 5.1.2 c52c15100fb2d85c3525d6d085b3663ec4f90fe6 5.1.3 891c3ce894fa879532299910735bcc2a968245b1 5.1.4