tests/test-merge-revert.out
author Matt Mackall <mpm@selenic.com>
Fri, 21 Apr 2006 15:33:51 -0500
changeset 2108 30c7564f6dfc
parent 2036 c9226bcc288d
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.

1:016807e6fdaf
0:eb43f19ff115
016807e6fdaf tip
eb43f19ff115
eb43f19ff115+
reverting file1
? file1.orig
eb43f19ff115
? file1.orig
016807e6fdaf tip
merging file1
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip