Mercurial > hg

annotate tests/test-merge2.out @ 2108:30c7564f6dfc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move empty local repo logic for pull into findincoming This fixes a silly attempt to pull a changegroup from an empty repo.
author Matt Mackall <mpm@selenic.com>
date Fri, 21 Apr 2006 15:33:51 -0500
parents 5a034646e472
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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