Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge1.out @ 3118:7a635ef25132

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
3117:920f54a2249e 3118:7a635ef25132