diff tests/test-merge7.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 e506c14382fd
children 49988d9f0758
line wrap: on
line diff