annotate hgext/__init__.py @ 803:b96d51a357bd

test: get rid of all reference to conflicting changesets They are now called divergent for a long time.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Thu, 20 Feb 2014 13:32:04 -0800
parents 9825c7da5b54
children 5ef77a1d975c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
519
9825c7da5b54 ensure all file have a copyright notice
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 496
diff changeset
1 # Copyright 2011 Logilab SA <contact@logilab.fr>