tests/test-double-merge
changeset 5436 b4ae8535f834
parent 5057 99a4592ea886