t3404: test two "preserve merges with -p" cases