The unified diff between revisions [064545d1..] and [7dcfa605..] is displayed below. It can also be downloaded as a raw diff.

#
#
# delete "Lore 2006 #1.pages/thumbs/page_thumb_1-9.tiff"
#
# add_file "Lore 2006 #1.pages/UCC_clubroom_panorama_20060126.jpg"
#  content [ad94afcf5369ca21d3914b7384ca66c641126699]
#
# add_file "Lore 2006 #1.pages/flame_jon_phillips_01.png"
#  content [386aee7df7b8c04e9e73150a038a761c364cb24a]
#
# add_file "Lore 2006 #1.pages/thumbs/page_thumb_1.tiff"
#  content [6f1042630c22efa90acf893d2027d9a5905b001f]
#
# patch "Lore 2006 #1.pages/index.xml.gz"
#  from [a39d9992d60ba5f66d3bf7211f199e494b0a6622]
#    to [c518d9a2f93d51a05c3ac549afdf78f4f58d4aae]
#
#   set "Lore 2006 #1.pages/UCC_clubroom_panorama_20060126.jpg"
#  attr "mtn:manual_merge"
# value "true"
#
#   set "Lore 2006 #1.pages/flame_jon_phillips_01.png"
#  attr "mtn:manual_merge"
# value "true"
#
#   set "Lore 2006 #1.pages/thumbs/page_thumb_1.tiff"
#  attr "mtn:manual_merge"
# value "true"
#
============================================================
# Lore 2006 #1.pages/UCC_clubroom_panorama_20060126.jpg is binary
============================================================
# Lore 2006 #1.pages/flame_jon_phillips_01.png is binary
============================================================
# Lore 2006 #1.pages/thumbs/page_thumb_1.tiff is binary
============================================================
# Lore 2006 #1.pages/index.xml.gz is binary