#
#
# patch "cmd_merging.cc"
#  from [979f3f84c3e2c1740ae419b728b90c2fc6ffcbee]
#    to [6ee48e48d6ab44eb64335ee5fefc0f1bc0e3a4cb]
# 
# patch "cmd_packet.cc"
#  from [ef074f179836c43a7b7f27cd890e03e73692afb1]
#    to [a5dafc607400de8f02332e20e48e3cc4292d7ff6]
#
============================================================
--- cmd_merging.cc	979f3f84c3e2c1740ae419b728b90c2fc6ffcbee
+++ cmd_merging.cc	6ee48e48d6ab44eb64335ee5fefc0f1bc0e3a4cb
@@ -1022,7 +1022,8 @@ static void get_conflicts_rids(args_vect
 // Name: show_conflicts
 // Arguments:
 //   Two revision ids (optional, determined from the workspace if not given; there must be exactly two heads)
-// Added in: 7.1
+// Added in: 8.0
+// Changed in: 9.0 (see monotone.texi for details)
 // Purpose: Prints the conflicts between two revisions, to aid in merging them.
 //
 // Output format: see monotone.texi
============================================================
--- cmd_packet.cc	ef074f179836c43a7b7f27cd890e03e73692afb1
+++ cmd_packet.cc	a5dafc607400de8f02332e20e48e3cc4292d7ff6
@@ -149,7 +149,7 @@ namespace
 // Name : read_packets
 // Arguments:
 //   packet-data
-// Added in: 8.1
+// Added in: 9.0
 // Purpose:
 //   Store public keys (and incidentally anything else that can be
 //   represented as a packet) into the database.