Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge5.out @ 3296:4546a5e31cb8
Use filelog.cmp in checkfilemerge
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 08 Oct 2006 20:18:59 -0500 |
parents | 49988d9f0758 |
children | 41989e55fa37 |