hgext/__init__.py
author Mads Kiilerich <mads@kiilerich.com>
Tue, 15 Jan 2013 01:05:12 +0100
changeset 18337 557c8522aec0
parent 1360 7d439981bec4
child 28450 155e3308289c
permissions -rw-r--r--
tests: better test coverage of merges of flags This makes existing problems with merges of symlinks and files more obvious and add test coverage for tricky merges without real common ancestors.

# placeholder