> hg init > > Then you'll have a single repository that both developers agree on. Work > from that repo from then on. (you basically used hg as a merge tool) Of course, don't forget to check in an initial changeset after init'ing the fresh merged working directory. :) --Ted -- Ted Pavlic <ted at tedpavlic.com>