Author: philip
Revision: 1439551
Modified property: svn:log
Modified: svn:log at Mon Jan 28 18:31:00 2013
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Mon Jan 28 18:31:00 2013
@@ -1,3 +1,3 @@
* subversion/tests/cmdline/update_tests.py
- (update_moved_dir_file_move): Resolve conflixt, adjust expectations,
+ (update_moved_dir_file_move): Resolve conflict, adjust expectations,
remove XFail.