#
#
# patch "INSTALL"
#  from [d8b1659d4faf6e312bad5165e9d2a18cfec073c3]
#    to [a9f86fde1c441a93b4f8b56840f95c7f76d913e7]
# 
# patch "merge_conflict.cc"
#  from [77fd9f5f1549ea8244367929b275509f50dd875e]
#    to [932b2f4157fde62e67d38575f09748918fcb0c8c]
#
============================================================
--- INSTALL	d8b1659d4faf6e312bad5165e9d2a18cfec073c3
+++ INSTALL	a9f86fde1c441a93b4f8b56840f95c7f76d913e7
@@ -254,7 +254,7 @@ 1. prerequisites:
            dependencies is usually available soon after release.
 
            The following is needed to succesfully configure:
-             CXXFLAGS+="-I/usr/include/boost-1_33_1/"
+             export CXXFLAGS="-I/usr/include/boost-1_33_1/"; configure
 
            Easiest way to create a Cygwin package is using cygport
            (which must be installed separately as a Cygwin package)
============================================================
--- merge_conflict.cc	77fd9f5f1549ea8244367929b275509f50dd875e
+++ merge_conflict.cc	932b2f4157fde62e67d38575f09748918fcb0c8c
@@ -2261,6 +2261,8 @@ if (opts.resolve_conflicts_given || opts
           pars.sym();
           pars.hex(temp);
 
+          // if there is no ancestor revision, then left is an ancestor of
+          // right, or vice versa, and there can be no conflicts.
           read_conflict_file_core (pars, left_roster, right_roster, result, true);
         }
     }