Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge1.out @ 3118:7a635ef25132
merge: simplify tests for local changed/remote deleted
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 17 Sep 2006 20:18:27 -0500 |
parents | a31557193f3c |
children | 966632304dde 49966b5ab16f |