log tests/test-import-merge.t @ 16277:1c2aaf05f7d7 stable

age author description
Wed, 16 Nov 2011 12:53:10 +0100 Patrick Mezard import: fix parent selection when importing merges stable