Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-conflict.out @ 2653:b24efed24e8f
allow specifying a file to hg parents, change the syntax to use -r/--rev
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Mon, 17 Jul 2006 02:00:49 +0200 |
parents | b2ae81a7df29 |
children | 46280c004f22 |
comparison
equal
deleted
inserted
replaced
2652:f23973ea3107 | 2653:b24efed24e8f |
---|