Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge2.out @ 1591:5a3229cf1492

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not copy atime and mtime in util.copyfiles it is unsupported on some fs (vfat) and we don't need to copy it one clone anyway
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 16 Dec 2005 01:32:44 -0600
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