tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Fri, 21 Apr 2006 15:33:51 -0500
changeset 2108 30c7564f6dfc
parent 2038 5c4496ed152d
child 2175 b2ae81a7df29
permissions -rw-r--r--
Move empty local repo logic for pull into findincoming This fixes a silly attempt to pull a changegroup from an empty repo.

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)