tests/test-excessive-merge
changeset 1799 b942f5cfd326
parent 1716 ef8cd889a78b
child 1933 7544700fd931