# 
# patch "ChangeLog"
#  from [3aa37d6926982ab7478c425571a7db636cdcd7d3]
#    to [755d58f388c16d13e6257b19381531bf7151ddcd]
# 
# patch "netsync.cc"
#  from [fffa11246af3df2d1eec93b7b7927513ab63f2dc]
#    to [4d76025ec5cac103ea22addaef89caefb36e23ae]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,10 @@
 2005-05-30  Matt Johnston  <address@hidden>
 
+	* netsync.cc: cosmetic linebreak tidying for "double-check the
+	fingerprint" message.
+
+2005-05-30  Matt Johnston  <address@hidden>
+
 	* tests/t_fmerge.at: scrap all the diff3/ed, just compare it with
 	known-good output.
 
--- netsync.cc
+++ netsync.cc
@@ -1454,8 +1454,8 @@
   else
     {
       P(F("first time connecting to server %s\n") % peer_id);
-      P(F("I'll assume it's really them, but you might want to\n"));
-      P(F("double-check their key's fingerprint: %s\n") % their_key_hash);
+      P(F("I'll assume it's really them, but you might want to double-check\n"));
+      P(F("their key's fingerprint: %s\n") % their_key_hash);
       app.db.set_var(their_key_key, var_value(their_key_hash()));
     }
   if (!app.db.public_key_exists(their_key_hash))