Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge2.out @ 2064:547ede0123a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util.unlink should only catch OSError.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Thu, 13 Apr 2006 13:46:56 -0700
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