evolve: evolve --divergent failed when merge had nothing to do (issue4950)
Before this patch, if the divergence resolution lead to an empty commit, the
transaction would be rolled back and the divergence not resolved.
This patch allows empty commits in that case. It is legitimate to end up with
an empty commit in that case, for example when divergent commits differ over
their commit messages.
recursive-include docs/figures *.svg
include docs/figures/hgview-example.png
include docs/*.rst
include docs/*.py
include docs/tutorials/*.t
include docs/makefile
include docs/static/*.svg
include hgext/__init__.py
include hgext/evolve.py
include hgext/pushexperiment.py
include hgext/simple4server.py
include setup.py
include README
include COPYING
include tests/*.t
include tests/*.py
include tests/_exc-util.sh
include tests/dummyssh
exclude tests/test-oldconvert.t
exclude tests/test-qsync.t
exclude tests/test-drop.t