Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge6 @ 3407:d2b55e3c4e25
merge: if filemerge skips merge, report as updated
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 15 Oct 2006 16:18:09 -0500 |
parents | e506c14382fd |
children | ad3d5b4367cb |
comparison
equal
deleted
inserted
replaced
3399:5dbb3a991bbf | 3407:d2b55e3c4e25 |
---|