# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1321225262 18000
# Node ID f78c198a9fd8fd921a87d4a16067c44fe32fc5d5
# Parent  58b4bcf3112fe06f54bf130a5b94a2e840bd6752# Parent  ca0dbc1378a97fe06281450f9170ae12a3190f8e
Merge.

diff -r 58b4bcf3112f -r f78c198a9fd8 chapters/25.markdown
--- a/chapters/25.markdown	Sun Nov 13 17:59:27 2011 -0500
+++ b/chapters/25.markdown	Sun Nov 13 18:01:02 2011 -0500
@@ -74,7 +74,7 @@
 
     :echo 2 * 2.0
 
-Vim displays "2.0".
+Vim displays "4.0".
 
 Division
 --------