Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge3.out @ 2027:94d3170399e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
work around python bug on solaris 10. write to file opened mode 'a+' should write to end of file and update offset pointer, but does not (solaris 10 has python 2.3.3). fix is to always seek.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Thu, 30 Mar 2006 19:28:41 -0800
parents 91c56c427171
children
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 removing b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 775
diff changeset
2 nothing changed