Mercurial > evolve
diff tests/test-stabilize-conflict.t @ 4234:2cc81ae30f37
next: set if we need to evolve or not; also move logic to appropriate pos
set the value `needevolve` and also move the logic to find aspiringchildren
to appropriate position i.e before we suggest user to use other flags like
--merge.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Sat, 10 Nov 2018 15:30:10 +0100 |
| parents | fb8e44c70798 |
| children | 684cc3418ecd a2fdbece7ce1 96ce1030d2fb |