| commit | 66566263f0fc1173d9afaf3da9298e07c0521037 | [log] [tgz] |
|---|---|---|
| author | Paul Burba <pburba@apache.org> | Thu Jul 22 20:43:48 2010 +0000 |
| committer | Paul Burba <pburba@apache.org> | Thu Jul 22 20:43:48 2010 +0000 |
| tree | 6af6913c28423812358c3e2f4834e7b1806596d6 | |
| parent | 830fc4e85b5c0dd9c2c10f94bfd6d0193eb3ab12 [diff] |
On the 1.6.x-issue3657 backport branch fix new test to work on 1.6.x. * subversion/tests/cmdline/merge_tests.py (copy_causes_phantom_eol_conflict): Tweak call to run_and_verify_merge so it works with 1.6.x. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-issue3657@966852 13f79535-47bb-0310-9956-ffa450edef68