Author: stsp
Revision: 1524145
Modified property: svn:log
Modified: svn:log at Tue Sep 17 18:11:50 2013
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Tue Sep 17 18:11:50 2013
@@ -1,4 +1,4 @@
-In the interactive conflcit prompt, make the 'merge' option try the external
+At the interactive conflict prompt, make the 'merge' option try the external
merge tool first, and fall back to the internal merge tool if the external
tool fails.
