Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge5.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 | 49988d9f0758 |
children | 41989e55fa37 |
comparison
equal
deleted
inserted
replaced
3117:920f54a2249e | 3118:7a635ef25132 |
---|