Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-up-local-change.out @ 4603:66ed92ed115a
Make fast-forward merges full merges
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 18 Jun 2007 12:38:54 -0700 |
parents | fffc8a733bf9 |
children | 17ed9b9a0d03 |