tests/test-merge2.out
author Matt Mackall <mpm@selenic.com>
Fri, 21 Apr 2006 15:33:51 -0500
changeset 2108 30c7564f6dfc
parent 925 5a034646e472
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
     1
adding b
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
     2
adding b