diff tests/test-double-merge.t @ 17022:8a38839ae1dc

test-subrepo-git.t: adapt for Windows hg forget 'notafile*' is changed to use a name that is valid on Windows so we still get the same error ... but the error message is disabled because it varies with the Windows version.
author Eduard-Cristian Stefan <alexandrul.ct@gmail.com>
date Wed, 20 Jun 2012 02:09:49 +0300
parents f2719b387380
children a6fe1b9cc68f
line wrap: on
line diff