test-merge-changedelete.t: add a file with regular merge conflicts
In upcoming patches we're going to move change/delete conflicts to the resolve
phase -- it will be important to see how regular conflicts interact with
change/delete ones.
@echo off
rem launch hg.exe from parent folder
"%~dp0\..\hg.exe" %*