# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1325355996 18000
# Node ID c40a55cd4ae4e07eea48c768e948731312f2a5d4
# Parent  4ba338c385b308553d8aa6abeaf380683ca844df# Parent  e0ad28e711966a98632cdd8a1c6935ccf3668425
Merge.

diff -r 4ba338c385b3 -r c40a55cd4ae4 chapters/25.markdown
--- a/chapters/25.markdown	Sat Dec 31 13:26:29 2011 -0500
+++ b/chapters/25.markdown	Sat Dec 31 13:26:36 2011 -0500
@@ -33,8 +33,8 @@
     :echom 017
     :echom 019
 
-Vim will print "15" for the first command, because "18" in octal is equal to
-"18" in decimal.  For the second command Vim treats it as a decimal number, even
+Vim will print "15" for the first command, because "17" in octal is equal to
+"15" in decimal.  For the second command Vim treats it as a decimal number, even
 though it starts with a `0`, because it's not a valid octal number.
 
 Because Vim silently does the wrong thing in this case, I'd recommend avoiding