Mercurial > hg > mercurial-crew-with-dirclash
diff tests/simple-merge @ 69:ab03c7a52cf2
Minor changes to import so that we can successfully import Ingo's
kernel history patchset.
author | mpm@selenic.com |
---|---|
date | Fri, 13 May 2005 18:22:08 -0800 |
parents | 9f64ee817199 |
children |