Mercurial > evolve
view setup.cfg @ 3841:82b79a8dafd9
tests: add test about aborting content-divergence when multiple parents
This patch adds tests for --abort flag of hg evolve command when we are
resolving content-divergence which are on different parents and parent of one of
them is the gca of both of them.
The tests shows that we are doing good and we should advertise the flag during
conflicts.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Tue, 12 Jun 2018 03:29:13 +0530 |
parents | b81d3775006b |
children |
line wrap: on
line source
[flake8] ignore = #closing bracket does not match indentation of opening bracket's line E123, # closing bracket does not match visual indentation E124, # visually indented line with same indent as next logical line E129, # at least two spaces before inline comment E261, # too many leading '#' for block comment E266, # expected 2 blank lines, found 0 E302, # expected 2 blank lines after end of function or class E305, # module level import not at top of file E402, # line too long (82 > 79 characters) E501, # do not assign a lambda expression, use a def E731, # class names should use CapWords convention N801, # line break occurred before a binary operator W503 builtins=xrange, execfile