test-rebase-conflicts.t #1