Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-conflict.out @ 2999:fa9c769fee8a
merge: minor simplification
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 22 Aug 2006 16:12:54 -0500 |
parents | b2ae81a7df29 |
children | 46280c004f22 |