Mercurial > hg

annotate tests/test-atomictempfile.py.out @ 18337:557c8522aec0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: better test coverage of merges of flags This makes existing problems with merges of symlinks and files more obvious and add test coverage for tricky merges without real common ancestors.
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 15 Jan 2013 01:05:12 +0100
parents d764463b433e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14007
d764463b433e atomictempfile: avoid infinite recursion in __del__().
Greg Ward <greg@gerg.ca>
parents:
diff changeset
1 OK
d764463b433e atomictempfile: avoid infinite recursion in __del__().
Greg Ward <greg@gerg.ca>
parents:
diff changeset
2 OK
d764463b433e atomictempfile: avoid infinite recursion in __del__().
Greg Ward <greg@gerg.ca>
parents:
diff changeset
3 OK