# 
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/A.cd"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/A.dst"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/A.src"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/A.ud"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/B.cd"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/B.dst"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/B.src"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/B.ud"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/C.cd"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/C.dst"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/C.src"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/C.ud"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/D.cd"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/D.dst"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/D.src"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/D.ud"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/E.cd"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/E.dst"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/E.src"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/E.ud"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/F.cd"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/F.dst"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/F.src"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/F.ud"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/G.cd"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/G.dst"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/G.src"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/G.ud"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/H.cd"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/H.dst"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/H.src"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/H.ud"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/I.cd"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/I.dst"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/I.src"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/I.ud"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/J.cd"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/J.dst"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/J.src"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/J.ud"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/__driver__.lua"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/hello.cd"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/hello.dst"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/hello.src"
# 
# delete "tests/diff_output_formats_CREATEDONBRANCH/hello.ud"
# 
# rename "tests/diff_output_formats_CREATEDONBRANCH/A.cdp"
#     to "tests/diff_output_formats/A.cdp"
# 
# rename "tests/diff_output_formats_CREATEDONBRANCH/A.udp"
#     to "tests/diff_output_formats/A.udp"
# 
# rename "tests/diff_output_formats_CREATEDONBRANCH/B.cdp"
#     to "tests/diff_output_formats/B.cdp"
# 
# rename "tests/diff_output_formats_CREATEDONBRANCH/B.udp"
#     to "tests/diff_output_formats/B.udp"
# 
# rename "tests/diff_output_formats_CREATEDONBRANCH/C.cdp"
#     to "tests/diff_output_formats/C.cdp"
# 
# rename "tests/diff_output_formats_CREATEDONBRANCH/C.udp"
#     to "tests/diff_output_formats/C.udp"
# 
# rename "tests/diff_output_formats_CREATEDONBRANCH/D.cdp"
#     to "tests/diff_output_formats/D.cdp"
# 
# rename "tests/diff_output_formats_CREATEDONBRANCH/D.udp"
#     to "tests/diff_output_formats/D.udp"
# 
# rename "tests/diff_output_formats_CREATEDONBRANCH/E.cdp"
#     to "tests/diff_output_formats/E.cdp"
# 
# rename "tests/diff_output_formats_CREATEDONBRANCH/E.udp"
#     to "tests/diff_output_formats/E.udp"
# 
# rename "tests/diff_output_formats_CREATEDONBRANCH/F.cdp"
#     to "tests/diff_output_formats/F.cdp"
# 
# rename "tests/diff_output_formats_CREATEDONBRANCH/F.udp"
#     to "tests/diff_output_formats/F.udp"
# 
# rename "tests/diff_output_formats_CREATEDONBRANCH/G.cdp"
#     to "tests/diff_output_formats/G.cdp"
# 
# rename "tests/diff_output_formats_CREATEDONBRANCH/G.udp"
#     to "tests/diff_output_formats/G.udp"
# 
# rename "tests/diff_output_formats_CREATEDONBRANCH/H.cdp"
#     to "tests/diff_output_formats/H.cdp"
# 
# rename "tests/diff_output_formats_CREATEDONBRANCH/H.udp"
#     to "tests/diff_output_formats/H.udp"
# 
# rename "tests/diff_output_formats_CREATEDONBRANCH/I.cdp"
#     to "tests/diff_output_formats/I.cdp"
# 
# rename "tests/diff_output_formats_CREATEDONBRANCH/I.udp"
#     to "tests/diff_output_formats/I.udp"
# 
# rename "tests/diff_output_formats_CREATEDONBRANCH/J.cdp"
#     to "tests/diff_output_formats/J.cdp"
# 
# rename "tests/diff_output_formats_CREATEDONBRANCH/J.udp"
#     to "tests/diff_output_formats/J.udp"
# 
# rename "tests/diff_output_formats_CREATEDONBRANCH/hello.cdp"
#     to "tests/diff_output_formats/hello.cdp"
# 
# rename "tests/diff_output_formats_CREATEDONBRANCH/hello.udp"
#     to "tests/diff_output_formats/hello.udp"
# 
# patch "ChangeLog"
#  from [fe92b0cd78a55cd515e61b11530928be0f2082e9]
#    to [3d1f7838e6d402806beedbb0d4a4f4f26faa895c]
# 
# patch "cmd_diff_log.cc"
#  from [f13eae493d4d9b27613b0c30be4e120f199a222a]
#    to [9f7418b3d5bb2f995e81fb8244abb46f7f388103]
# 
# patch "diff_patch.cc"
#  from [a63d3103b97a83a63b9df3ba31605669a811b054]
#    to [e804b0182349269a3033a282309e6b65575161da]
# 
# patch "diff_patch.hh"
#  from [fcdaafb08dbc46b7e95c706e4e96b5fac2b57493]
#    to [8bb436468d67ceaa9f607565ed4d617d222f5593]
# 
# patch "tests/diff_output_formats/A.cdp"
#  from [87eaed30b1ef1fb338c9acafd3a12fc894531028]
#    to [e20d6d9db3f5ee4d4061c3896326d41ce2a44ba5]
# 
# patch "tests/diff_output_formats/A.udp"
#  from [b9dccc3bbc436f14d253b5cae5b885031aa53489]
#    to [588929bfff35a6a0b8e813303db71ac580bbe2d6]
# 
# patch "tests/diff_output_formats/B.cdp"
#  from [df96a8b5ff9c7ed2eb1065cee7291cd93a88397d]
#    to [713efcd6852ce37c6f1cc51a583f138b073e1278]
# 
# patch "tests/diff_output_formats/B.udp"
#  from [ad8e3cbae8ee44a9b9167f3fce8155a55840e299]
#    to [c09e4a2b100822923fccd7fa3b9aaed6179cdbf0]
# 
# patch "tests/diff_output_formats/C.cdp"
#  from [62f1650941bca9406553a24a59fa64a809d2d9ee]
#    to [80195b9f6f4427348486a4eba61c9c93a7e9df81]
# 
# patch "tests/diff_output_formats/C.udp"
#  from [712a589fe9c3611cbd53d55a7722046ac9bf5596]
#    to [493b8f06b8ff5b6aa5a698b74cb118d34830315d]
# 
# patch "tests/diff_output_formats/D.cdp"
#  from [cd64dc67a74fd709ace880f5bb16ccb78805a35a]
#    to [2d6553e25b4db0fd2ee1df718a757e0573f0314a]
# 
# patch "tests/diff_output_formats/D.udp"
#  from [ee6c2d228454f44dbded53ec84eed8f244d66394]
#    to [75aea2b0ea3ff4c5d1dcb4665e0eb241ded3accd]
# 
# patch "tests/diff_output_formats/E.cdp"
#  from [5359754f3f5ee3c31222c266d93da93754deb27c]
#    to [5a27f8b49d17b3742e4ab15bdd7c7a03e03269c3]
# 
# patch "tests/diff_output_formats/E.udp"
#  from [291adbd2143f1ded0671e332c5da03acba4731d5]
#    to [f09c78135b9a775d007d17312cb63e5c59a010da]
# 
# patch "tests/diff_output_formats/F.cdp"
#  from [da09b452df8eca6e4b409b2c60ed51ce4ed34abc]
#    to [79c2740b7f2399b96eaad49f2a08241f32586c8a]
# 
# patch "tests/diff_output_formats/F.udp"
#  from [45f8cd335cdb9748e59b6f56b33d71e265163a8b]
#    to [59615b78312abd4d3f91e137afe8f43b19a05a53]
# 
# patch "tests/diff_output_formats/G.cdp"
#  from [8472049d7b6e94f37226d3a1e5d11b8ce87c6f4f]
#    to [6603aa637ecad0fb22b20ef2f3225065c41ff351]
# 
# patch "tests/diff_output_formats/G.udp"
#  from [3fb6ca62deb44f8f6ed938498d5da2e2ac5a8634]
#    to [d24b419206a63b1737b6d9cb47a6582984b2c0b4]
# 
# patch "tests/diff_output_formats/H.cdp"
#  from [9cafc25f889fef524ee2391fbfa271c5876cf35e]
#    to [7ff850c76a1a87ec5bfb9425fe6d7042337c2ba0]
# 
# patch "tests/diff_output_formats/H.udp"
#  from [89c15555eb4658c6fdc8d38bf1e85060b79fdd05]
#    to [38852f19edb7c8b689ea77bf35e84faca74bbe78]
# 
# patch "tests/diff_output_formats/I.cdp"
#  from [06fdd7b950ce01d587d13ab1aec3203dfb0aa918]
#    to [6dccb3708aaa75784ff4bae6ce81d0dd55a541fe]
# 
# patch "tests/diff_output_formats/I.udp"
#  from [8e40b30a4ce01d94d30ecb336f5918fabf13555d]
#    to [779e7da5d0ff4faeaca73ae3099891cc91ebdeb3]
# 
# patch "tests/diff_output_formats/J.cdp"
#  from [bb1b2a8556d1750b60933ffb60ef2cbe01621a79]
#    to [7f0dfaa05c7901ac95da42260be390f8627254f2]
# 
# patch "tests/diff_output_formats/J.udp"
#  from [29fffc4740f7617713a79f51bf34ca6d9f99af15]
#    to [ae9011cf6eaaf22aba27bc9881a849b2ad32c23f]
# 
# patch "tests/diff_output_formats/__driver__.lua"
#  from [17d8d713c190f1a91fdf10ce0702d7a0aacc5b09]
#    to [6dbcdb090b2cd79c16c3aa84a6717da390e5614b]
# 
============================================================
--- ChangeLog	fe92b0cd78a55cd515e61b11530928be0f2082e9
+++ ChangeLog	3d1f7838e6d402806beedbb0d4a4f4f26faa895c
@@ -1,5 +1,18 @@
 2006-07-10  Zack Weinberg  <address@hidden>
 
+	* tests/diff_output_formats: Merge from mainline.  Correct
+	expected output where necessary.  Use long switches in __driver__.lua.
+	* diff_patch.cc (hunk_consumer::find_encloser): Use
+	reverse_iterators instead of mucking with ssize_t.
+	(unidiff_hunk_writer::flush_hunk)
+	(ctxdiff_hunk_writer::flush_hunk): Scan what is about to be
+	output, and give find_encloser exactly the right position.
+	(make_diff): Collapse the overload that takes vectors of strings
+	into its sole caller, the other overload.  * diff_patch.hh: Remove
+	prototype for deleted overload of make_diff.
+
+2006-07-10  Zack Weinberg  <address@hidden>
+
 	* tests/database_is_closed_on_signal_exit/__driver__.lua: Invert
 	sense of SIGSEGV test - expect database *not* to be cleaned up,
 	consistent with main.cc.  Remove xfail.
============================================================
--- cmd_diff_log.cc	f13eae493d4d9b27613b0c30be4e120f199a222a
+++ cmd_diff_log.cc	9f7418b3d5bb2f995e81fb8244abb46f7f388103
@@ -259,7 +259,7 @@
                 i->second,
                 i->second,
                 data(), unpacked,
-                cout, type, pattern);
+                cout, app.diff_format, pattern);
     }
 
   map<split_path, split_path> reverse_rename_map;
@@ -315,7 +315,7 @@
                 delta_entry_src(i),
                 delta_entry_dst(i),
                 data_old, data_new,
-                cout, type, pattern);
+                cout, app.diff_format, pattern);
     }
 }
 
============================================================
--- diff_patch.cc	a63d3103b97a83a63b9df3ba31605669a811b054
+++ diff_patch.cc	e804b0182349269a3033a282309e6b65575161da
@@ -805,25 +805,28 @@
 void
 hunk_consumer::find_encloser(size_t pos, string & encloser)
 {
+  typedef vector<string>::const_reverse_iterator riter;
+
   if (!encloser_re)
     return;
 
-  // We need the ability for i and last to go negative so that we do not
-  // have an infinite loop when last==0 (i.e. the first time 'round).
-  ssize_t last = encloser_last_search;
+  riter last = a.rbegin() + (a.size() - encloser_last_search);
   encloser_last_search = pos;
-  for (ssize_t i = min(pos, a.size()-1); i >= last; i--)
-    if (boost::regex_search (a[i], *encloser_re))
+
+  for (riter i = a.rbegin() + (a.size() - pos); i != last; i++) {
+    if (boost::regex_search (*i, *encloser_re))
       {
+        encloser_last_match = a.size() - (i - a.rbegin());
         L(FL("find_encloser: from %u matching line %d, \"%s\"")
-          % pos % i % a[i]);
-        encloser_last_match = i;
+          % pos % encloser_last_match % *i);
+
         // the number 40 is chosen to match GNU diff.  it could safely be
         // increased up to about 60 without overflowing the standard
         // terminal width.
-        encloser = string(" ") + a[i].substr(0, 40);
+        encloser = string(" ") + (*i).substr(0, 40);
         return;
       }
+  }
 
   if (encloser_last_match)
     {
@@ -943,10 +946,21 @@
           if (b_len > 1)
             ost << "," << b_len;
         }
-      string encloser;
-      find_encloser(a_begin + ctx, encloser);
-      ost << " @@" << encloser << endl;
 
+      {
+        string encloser;
+        ptrdiff_t first_mod = 0;
+        vector<string>::const_iterator i;
+        for (i = hunk.begin(); i != hunk.end(); i++)
+          if ((*i)[0] != ' ')
+            {
+              first_mod = i - hunk.begin();
+              break;
+            }
+        
+        find_encloser(a_begin + first_mod, encloser);
+        ost << " @@" << encloser << endl;
+      }
       copy(hunk.begin(), hunk.end(), ostream_iterator<string>(ost, "\n"));
     }
 
@@ -1057,11 +1071,33 @@
           b_len++;
         }
 
-      string encloser;
-      find_encloser(a_begin + ctx, encloser);
+      {
+        string encloser;
+        ptrdiff_t first_insert = b_len;
+        ptrdiff_t first_delete = a_len;
+        vector<string>::const_iterator i;
 
-      ost << "***************" << encloser << endl;
+        if (have_deletions)
+          for (i = from_file.begin(); i != from_file.end(); i++)
+            if ((*i)[0] != ' ')
+              {
+                first_delete = i - from_file.begin();
+                break;
+              }
+        if (have_insertions)
+          for (i = to_file.begin(); i != to_file.end(); i++)
+            if ((*i)[0] != ' ')
+              {
+                first_insert = i - to_file.begin();
+                break;
+              }
 
+        find_encloser(a_begin + min(first_insert, first_delete),
+                      encloser);
+        
+        ost << "***************" << encloser << endl;
+      }
+
       ost << "*** " << (a_begin + 1) << "," << (a_begin + a_len) << " ****" << endl;
       if (have_deletions)
         copy(from_file.begin(), from_file.end(), ostream_iterator<string>(ost, "\n"));
@@ -1161,39 +1197,27 @@
       }
 }
 
-void make_diff(string const & filename1,
-               string const & filename2,
-               file_id const & id1,
-               file_id const & id2,
-               data const & data1,
-               data const & data2,
-               ostream & ost,
-               diff_type type)
+void
+make_diff(string const & filename1,
+          string const & filename2,
+          file_id const & id1,
+          file_id const & id2,
+          data const & data1,
+          data const & data2,
+          ostream & ost,
+          diff_type type,
+          string const & pattern)
 {
   if (guess_binary(data1()) || guess_binary(data2()))
-    ost << "# " << filename2 << " is binary\n";
-  else
     {
-      vector<string> lines1, lines2;
-      split_into_lines(data1(), lines1);
-      split_into_lines(data2(), lines2);
-      make_diff(filename1, filename2,
-                id1, id2,
-                lines1, lines2,
-                ost, type);
+      ost << "# " << filename2 << " is binary\n";
+      return;
     }
-}
 
-void make_diff(string const & filename1,
-               string const & filename2,
-               file_id const & id1,
-               file_id const & id2,
-               vector<string> const & lines1,
-               vector<string> const & lines2,
-               ostream & ost,
-               diff_type type,
-               string const & pattern)
-{
+  vector<string> lines1, lines2;
+  split_into_lines(data1(), lines1);
+  split_into_lines(data2(), lines2);
+
   vector<long, QA(long)> left_interned;
   vector<long, QA(long)> right_interned;
   vector<long, QA(long)> lcs;
@@ -1337,6 +1361,7 @@
 
       cerr << endl;
     }
+}
 
 // high tech randomizing test
 
============================================================
--- diff_patch.hh	fcdaafb08dbc46b7e95c706e4e96b5fac2b57493
+++ diff_patch.hh	8bb436468d67ceaa9f607565ed4d617d222f5593
@@ -35,15 +35,6 @@
                data const & data1,
                data const & data2,
                std::ostream & ost,
-               diff_type type);
-
-void make_diff(std::string const & filename1,
-               std::string const & filename2,
-               file_id const & id1,
-               file_id const & id2,
-               std::vector<std::string> const & lines1,
-               std::vector<std::string> const & lines2,
-               std::ostream & ost,
                diff_type type,
                std::string const & pattern);
 
============================================================
--- tests/diff_output_formats_CREATEDONBRANCH/A.cdp	87eaed30b1ef1fb338c9acafd3a12fc894531028
+++ tests/diff_output_formats/A.cdp	e20d6d9db3f5ee4d4061c3896326d41ce2a44ba5
@@ -22,7 +22,7 @@
   hunk 1 -- initial 7
   hunk 1 -- initial 8
 --- 1,9 ----
-*************** hunk 7 -- initial 6
+*************** hunk 7 -- initial 9
 *** 78,85 ****
 --- 68,80 ----
   hunk 7 -- initial 7
@@ -38,7 +38,7 @@
   hunk 8 -- initial 2
   hunk 8 -- initial 3
   hunk 8 -- initial 4
-*************** hunk 8 -- initial 6
+*************** hunk 8 -- initial 9
 *** 88,100 ****
   hunk 8 -- initial 7
   hunk 8 -- initial 8
============================================================
--- tests/diff_output_formats_CREATEDONBRANCH/A.udp	b9dccc3bbc436f14d253b5cae5b885031aa53489
+++ tests/diff_output_formats/A.udp	588929bfff35a6a0b8e813303db71ac580bbe2d6
@@ -20,7 +20,7 @@
  hunk 1 -- initial 6
  hunk 1 -- initial 7
  hunk 1 -- initial 8
-@@ -78,8 +68,13 @@ hunk 7 -- initial 6
+@@ -78,8 +68,13 @@ hunk 7 -- initial 9
  hunk 7 -- initial 7
  hunk 7 -- initial 8
  hunk 7 -- initial 9
@@ -34,7 +34,7 @@
  hunk 8 -- initial 2
  hunk 8 -- initial 3
  hunk 8 -- initial 4
-@@ -88,13 +83,18 @@ hunk 8 -- initial 6
+@@ -88,13 +83,18 @@ hunk 8 -- initial 9
  hunk 8 -- initial 7
  hunk 8 -- initial 8
  hunk 8 -- initial 9
============================================================
--- tests/diff_output_formats_CREATEDONBRANCH/B.cdp	df96a8b5ff9c7ed2eb1065cee7291cd93a88397d
+++ tests/diff_output_formats/B.cdp	713efcd6852ce37c6f1cc51a583f138b073e1278
@@ -118,7 +118,7 @@
   hunk 4 -- initial 7
   hunk 4 -- initial 8
   hunk 4 -- initial 9
-*************** hunk 7 -- initial 6
+*************** hunk 7 -- initial 9
 *** 78,92 ****
   hunk 7 -- initial 7
   hunk 7 -- initial 8
@@ -136,7 +136,7 @@
   hunk 9 -- initial 0
   hunk 9 -- initial 1
 --- 93,102 ----
-*************** hunk 9 -- initial 9
+*************** hunk 10 -- initial 2
 *** 101,107 ****
 --- 111,122 ----
   hunk 10 -- initial 0
@@ -151,7 +151,7 @@
   hunk 10 -- initial 4
   hunk 10 -- initial 5
   hunk 10 -- initial 6
-*************** hunk 10 -- initial 7
+*************** hunk 11 -- initial 0
 *** 109,120 ****
   hunk 10 -- initial 8
   hunk 10 -- initial 9
============================================================
--- tests/diff_output_formats_CREATEDONBRANCH/B.udp	ad8e3cbae8ee44a9b9167f3fce8155a55840e299
+++ tests/diff_output_formats/B.udp	c09e4a2b100822923fccd7fa3b9aaed6179cdbf0
@@ -76,7 +76,7 @@
  hunk 4 -- initial 7
  hunk 4 -- initial 8
  hunk 4 -- initial 9
-@@ -78,15 +93,10 @@ hunk 7 -- initial 6
+@@ -78,15 +93,10 @@ hunk 7 -- initial 9
  hunk 7 -- initial 7
  hunk 7 -- initial 8
  hunk 7 -- initial 9
@@ -92,7 +92,7 @@
  hunk 8 -- initial 9
  hunk 9 -- initial 0
  hunk 9 -- initial 1
-@@ -101,7 +111,12 @@ hunk 9 -- initial 9
+@@ -101,7 +111,12 @@ hunk 10 -- initial 2
  hunk 10 -- initial 0
  hunk 10 -- initial 1
  hunk 10 -- initial 2
@@ -105,7 +105,7 @@
  hunk 10 -- initial 4
  hunk 10 -- initial 5
  hunk 10 -- initial 6
-@@ -109,12 +124,7 @@ hunk 10 -- initial 7
+@@ -109,12 +124,7 @@ hunk 11 -- initial 0
  hunk 10 -- initial 8
  hunk 10 -- initial 9
  hunk 11 -- initial 0
============================================================
--- tests/diff_output_formats_CREATEDONBRANCH/C.cdp	62f1650941bca9406553a24a59fa64a809d2d9ee
+++ tests/diff_output_formats/C.cdp	80195b9f6f4427348486a4eba61c9c93a7e9df81
@@ -1,6 +1,6 @@
 *** C	a855dab66165b2d529ede16de9e7334aaf58778f
 --- C	d127b34595fcbd709ce2dedb033065e4e3b5d351
-*************** hunk 1 -- initial 2
+*************** hunk 1 -- initial 5
 *** 14,22 ****
 --- 14,27 ----
   hunk 1 -- initial 3
@@ -17,7 +17,7 @@
   hunk 1 -- initial 9
   hunk 2 -- initial 0
   hunk 2 -- initial 1
-*************** hunk 2 -- initial 6
+*************** hunk 2 -- initial 9
 *** 28,52 ****
   hunk 2 -- initial 7
   hunk 2 -- initial 8
@@ -70,7 +70,7 @@
   hunk 4 -- initial 9
   hunk 5 -- initial 0
   hunk 5 -- initial 1
-*************** hunk 7 -- initial 6
+*************** hunk 7 -- initial 9
 *** 78,91 ****
 --- 83,101 ----
   hunk 7 -- initial 7
@@ -92,7 +92,7 @@
   hunk 8 -- initial 8
   hunk 8 -- initial 9
   hunk 9 -- initial 0
-*************** hunk 11 -- initial 6
+*************** hunk 11 -- initial 9
 *** 118,140 ****
   hunk 11 -- initial 7
   hunk 11 -- initial 8
============================================================
--- tests/diff_output_formats_CREATEDONBRANCH/C.udp	712a589fe9c3611cbd53d55a7722046ac9bf5596
+++ tests/diff_output_formats/C.udp	493b8f06b8ff5b6aa5a698b74cb118d34830315d
@@ -1,6 +1,6 @@
 --- C	a855dab66165b2d529ede16de9e7334aaf58778f
 +++ C	d127b34595fcbd709ce2dedb033065e4e3b5d351
-@@ -14,9 +14,14 @@ hunk 1 -- initial 2
+@@ -14,9 +14,14 @@ hunk 1 -- initial 5
  hunk 1 -- initial 3
  hunk 1 -- initial 4
  hunk 1 -- initial 5
@@ -15,7 +15,7 @@
  hunk 1 -- initial 9
  hunk 2 -- initial 0
  hunk 2 -- initial 1
-@@ -28,25 +33,25 @@ hunk 2 -- initial 6
+@@ -28,25 +33,25 @@ hunk 2 -- initial 9
  hunk 2 -- initial 7
  hunk 2 -- initial 8
  hunk 2 -- initial 9
@@ -46,7 +46,7 @@
  hunk 4 -- initial 9
  hunk 5 -- initial 0
  hunk 5 -- initial 1
-@@ -78,14 +83,19 @@ hunk 7 -- initial 6
+@@ -78,14 +83,19 @@ hunk 7 -- initial 9
  hunk 7 -- initial 7
  hunk 7 -- initial 8
  hunk 7 -- initial 9
@@ -66,7 +66,7 @@
  hunk 8 -- initial 8
  hunk 8 -- initial 9
  hunk 9 -- initial 0
-@@ -118,23 +128,23 @@ hunk 11 -- initial 6
+@@ -118,23 +128,23 @@ hunk 11 -- initial 9
  hunk 11 -- initial 7
  hunk 11 -- initial 8
  hunk 11 -- initial 9
============================================================
--- tests/diff_output_formats_CREATEDONBRANCH/D.cdp	cd64dc67a74fd709ace880f5bb16ccb78805a35a
+++ tests/diff_output_formats/D.cdp	2d6553e25b4db0fd2ee1df718a757e0573f0314a
@@ -15,7 +15,7 @@
   hunk 1 -- initial 0
   hunk 1 -- initial 1
 --- 1,7 ----
-*************** hunk 3 -- initial 6
+*************** hunk 3 -- initial 9
 *** 38,51 ****
   hunk 3 -- initial 7
   hunk 3 -- initial 8
@@ -32,7 +32,7 @@
   hunk 4 -- initial 9
   hunk 5 -- initial 0
 --- 33,41 ----
-*************** hunk 6 -- initial 6
+*************** hunk 6 -- initial 9
 *** 68,82 ****
   hunk 6 -- initial 7
   hunk 6 -- initial 8
@@ -50,7 +50,7 @@
   hunk 8 -- initial 0
   hunk 8 -- initial 1
 --- 58,67 ----
-*************** hunk 9 -- initial 7
+*************** hunk 10 -- initial 0
 *** 99,131 ****
   hunk 9 -- initial 8
   hunk 9 -- initial 9
@@ -124,7 +124,7 @@
   hunk 12 -- initial 8
   hunk 12 -- initial 9
   hunk 13 -- initial 0
-*************** hunk 14 -- initial 6
+*************** hunk 14 -- initial 9
 *** 148,160 ****
   hunk 14 -- initial 7
   hunk 14 -- initial 8
============================================================
--- tests/diff_output_formats_CREATEDONBRANCH/D.udp	ee6c2d228454f44dbded53ec84eed8f244d66394
+++ tests/diff_output_formats/D.udp	75aea2b0ea3ff4c5d1dcb4665e0eb241ded3accd
@@ -13,7 +13,7 @@
  hunk 0 -- initial 9
  hunk 1 -- initial 0
  hunk 1 -- initial 1
-@@ -38,14 +33,9 @@ hunk 3 -- initial 6
+@@ -38,14 +33,9 @@ hunk 3 -- initial 9
  hunk 3 -- initial 7
  hunk 3 -- initial 8
  hunk 3 -- initial 9
@@ -28,7 +28,7 @@
  hunk 4 -- initial 8
  hunk 4 -- initial 9
  hunk 5 -- initial 0
-@@ -68,15 +58,10 @@ hunk 6 -- initial 6
+@@ -68,15 +58,10 @@ hunk 6 -- initial 9
  hunk 6 -- initial 7
  hunk 6 -- initial 8
  hunk 6 -- initial 9
@@ -44,7 +44,7 @@
  hunk 7 -- initial 9
  hunk 8 -- initial 0
  hunk 8 -- initial 1
-@@ -99,33 +84,38 @@ hunk 9 -- initial 7
+@@ -99,33 +84,38 @@ hunk 10 -- initial 0
  hunk 9 -- initial 8
  hunk 9 -- initial 9
  hunk 10 -- initial 0
@@ -88,7 +88,7 @@
  hunk 12 -- initial 8
  hunk 12 -- initial 9
  hunk 13 -- initial 0
-@@ -148,13 +138,8 @@ hunk 14 -- initial 6
+@@ -148,13 +138,8 @@ hunk 14 -- initial 9
  hunk 14 -- initial 7
  hunk 14 -- initial 8
  hunk 14 -- initial 9
============================================================
--- tests/diff_output_formats_CREATEDONBRANCH/E.cdp	5359754f3f5ee3c31222c266d93da93754deb27c
+++ tests/diff_output_formats/E.cdp	5a27f8b49d17b3742e4ab15bdd7c7a03e03269c3
@@ -1,6 +1,6 @@
 *** E	b984e2f8d936bf914f04e727e43b10760b71dc4f
 --- E	0452f954f62fe0e94ba5dd31d970cfbf3f1b0d69
-*************** hunk 0 -- initial 6
+*************** hunk 0 -- initial 9
 *** 8,18 ****
 --- 8,23 ----
   hunk 0 -- initial 7
@@ -19,7 +19,7 @@
   hunk 1 -- initial 5
   hunk 1 -- initial 6
   hunk 1 -- initial 7
-*************** hunk 3 -- initial 6
+*************** hunk 3 -- initial 9
 *** 38,49 ****
 --- 43,59 ----
   hunk 3 -- initial 7
@@ -39,7 +39,7 @@
   hunk 4 -- initial 6
   hunk 4 -- initial 7
   hunk 4 -- initial 8
-*************** hunk 8 -- initial 6
+*************** hunk 8 -- initial 9
 *** 88,98 ****
 --- 98,113 ----
   hunk 8 -- initial 7
@@ -58,7 +58,7 @@
   hunk 9 -- initial 5
   hunk 9 -- initial 6
   hunk 9 -- initial 7
-*************** hunk 10 -- initial 2
+*************** hunk 10 -- initial 5
 *** 104,112 ****
 --- 119,132 ----
   hunk 10 -- initial 3
@@ -75,7 +75,7 @@
   hunk 10 -- initial 9
   hunk 11 -- initial 0
   hunk 11 -- initial 1
-*************** hunk 11 -- initial 7
+*************** hunk 12 -- initial 0
 *** 119,132 ****
   hunk 11 -- initial 8
   hunk 11 -- initial 9
@@ -92,7 +92,7 @@
   hunk 13 -- initial 0
   hunk 13 -- initial 1
 --- 139,147 ----
-*************** hunk 13 -- initial 6
+*************** hunk 13 -- initial 9
 *** 138,152 ****
   hunk 13 -- initial 7
   hunk 13 -- initial 8
@@ -110,7 +110,7 @@
   hunk 15 -- initial 0
   hunk 15 -- initial 1
 --- 153,162 ----
-*************** hunk 17 -- initial 6
+*************** hunk 17 -- initial 9
 *** 178,180 ****
 --- 188,200 ----
   hunk 17 -- initial 7
============================================================
--- tests/diff_output_formats_CREATEDONBRANCH/E.udp	291adbd2143f1ded0671e332c5da03acba4731d5
+++ tests/diff_output_formats/E.udp	f09c78135b9a775d007d17312cb63e5c59a010da
@@ -1,6 +1,6 @@
 --- E	b984e2f8d936bf914f04e727e43b10760b71dc4f
 +++ E	0452f954f62fe0e94ba5dd31d970cfbf3f1b0d69
-@@ -8,11 +8,16 @@ hunk 0 -- initial 6
+@@ -8,11 +8,16 @@ hunk 0 -- initial 9
  hunk 0 -- initial 7
  hunk 0 -- initial 8
  hunk 0 -- initial 9
@@ -17,7 +17,7 @@
  hunk 1 -- initial 5
  hunk 1 -- initial 6
  hunk 1 -- initial 7
-@@ -38,12 +43,17 @@ hunk 3 -- initial 6
+@@ -38,12 +43,17 @@ hunk 3 -- initial 9
  hunk 3 -- initial 7
  hunk 3 -- initial 8
  hunk 3 -- initial 9
@@ -35,7 +35,7 @@
  hunk 4 -- initial 6
  hunk 4 -- initial 7
  hunk 4 -- initial 8
-@@ -88,11 +98,16 @@ hunk 8 -- initial 6
+@@ -88,11 +98,16 @@ hunk 8 -- initial 9
  hunk 8 -- initial 7
  hunk 8 -- initial 8
  hunk 8 -- initial 9
@@ -52,7 +52,7 @@
  hunk 9 -- initial 5
  hunk 9 -- initial 6
  hunk 9 -- initial 7
-@@ -104,9 +119,14 @@ hunk 10 -- initial 2
+@@ -104,9 +119,14 @@ hunk 10 -- initial 5
  hunk 10 -- initial 3
  hunk 10 -- initial 4
  hunk 10 -- initial 5
@@ -67,7 +67,7 @@
  hunk 10 -- initial 9
  hunk 11 -- initial 0
  hunk 11 -- initial 1
-@@ -119,14 +139,9 @@ hunk 11 -- initial 7
+@@ -119,14 +139,9 @@ hunk 12 -- initial 0
  hunk 11 -- initial 8
  hunk 11 -- initial 9
  hunk 12 -- initial 0
@@ -82,7 +82,7 @@
  hunk 12 -- initial 9
  hunk 13 -- initial 0
  hunk 13 -- initial 1
-@@ -138,15 +153,10 @@ hunk 13 -- initial 6
+@@ -138,15 +153,10 @@ hunk 13 -- initial 9
  hunk 13 -- initial 7
  hunk 13 -- initial 8
  hunk 13 -- initial 9
@@ -98,7 +98,7 @@
  hunk 14 -- initial 9
  hunk 15 -- initial 0
  hunk 15 -- initial 1
-@@ -178,3 +188,13 @@ hunk 17 -- initial 6
+@@ -178,3 +188,13 @@ hunk 17 -- initial 9
  hunk 17 -- initial 7
  hunk 17 -- initial 8
  hunk 17 -- initial 9
============================================================
--- tests/diff_output_formats_CREATEDONBRANCH/F.cdp	da09b452df8eca6e4b409b2c60ed51ce4ed34abc
+++ tests/diff_output_formats/F.cdp	79c2740b7f2399b96eaad49f2a08241f32586c8a
@@ -29,7 +29,7 @@
   hunk 0 -- initial 8
   hunk 0 -- initial 9
   hunk 1 -- initial 0
-*************** hunk 2 -- initial 0
+*************** hunk 2 -- initial 3
 *** 22,42 ****
   hunk 2 -- initial 1
   hunk 2 -- initial 2
@@ -74,7 +74,7 @@
   hunk 3 -- initial 9
   hunk 4 -- initial 0
   hunk 4 -- initial 1
-*************** hunk 5 -- initial 8
+*************** hunk 6 -- initial 1
 *** 60,70 ****
 --- 75,90 ----
   hunk 5 -- initial 9
@@ -93,7 +93,7 @@
   hunk 6 -- initial 7
   hunk 6 -- initial 8
   hunk 6 -- initial 9
-*************** hunk 9 -- initial 6
+*************** hunk 9 -- initial 9
 *** 98,111 ****
   hunk 9 -- initial 7
   hunk 9 -- initial 8
@@ -110,7 +110,7 @@
   hunk 10 -- initial 9
   hunk 11 -- initial 0
 --- 118,126 ----
-*************** hunk 11 -- initial 3
+*************** hunk 11 -- initial 6
 *** 115,142 ****
   hunk 11 -- initial 4
   hunk 11 -- initial 5
@@ -164,7 +164,7 @@
   hunk 13 -- initial 9
   hunk 14 -- initial 0
   hunk 14 -- initial 1
-*************** hunk 19 -- initial 6
+*************** hunk 19 -- initial 9
 *** 198,200 ****
 --- 208,220 ----
   hunk 19 -- initial 7
============================================================
--- tests/diff_output_formats_CREATEDONBRANCH/F.udp	45f8cd335cdb9748e59b6f56b33d71e265163a8b
+++ tests/diff_output_formats/F.udp	59615b78312abd4d3f91e137afe8f43b19a05a53
@@ -27,7 +27,7 @@
  hunk 0 -- initial 8
  hunk 0 -- initial 9
  hunk 1 -- initial 0
-@@ -22,21 +37,21 @@ hunk 2 -- initial 0
+@@ -22,21 +37,21 @@ hunk 2 -- initial 3
  hunk 2 -- initial 1
  hunk 2 -- initial 2
  hunk 2 -- initial 3
@@ -54,7 +54,7 @@
  hunk 3 -- initial 9
  hunk 4 -- initial 0
  hunk 4 -- initial 1
-@@ -60,11 +75,16 @@ hunk 5 -- initial 8
+@@ -60,11 +75,16 @@ hunk 6 -- initial 1
  hunk 5 -- initial 9
  hunk 6 -- initial 0
  hunk 6 -- initial 1
@@ -71,7 +71,7 @@
  hunk 6 -- initial 7
  hunk 6 -- initial 8
  hunk 6 -- initial 9
-@@ -98,14 +118,9 @@ hunk 9 -- initial 6
+@@ -98,14 +118,9 @@ hunk 9 -- initial 9
  hunk 9 -- initial 7
  hunk 9 -- initial 8
  hunk 9 -- initial 9
@@ -86,7 +86,7 @@
  hunk 10 -- initial 8
  hunk 10 -- initial 9
  hunk 11 -- initial 0
-@@ -115,28 +130,23 @@ hunk 11 -- initial 3
+@@ -115,28 +130,23 @@ hunk 11 -- initial 6
  hunk 11 -- initial 4
  hunk 11 -- initial 5
  hunk 11 -- initial 6
@@ -120,7 +120,7 @@
  hunk 13 -- initial 9
  hunk 14 -- initial 0
  hunk 14 -- initial 1
-@@ -198,3 +208,13 @@ hunk 19 -- initial 6
+@@ -198,3 +208,13 @@ hunk 19 -- initial 9
  hunk 19 -- initial 7
  hunk 19 -- initial 8
  hunk 19 -- initial 9
============================================================
--- tests/diff_output_formats_CREATEDONBRANCH/G.cdp	8472049d7b6e94f37226d3a1e5d11b8ce87c6f4f
+++ tests/diff_output_formats/G.cdp	6603aa637ecad0fb22b20ef2f3225065c41ff351
@@ -1,6 +1,6 @@
 *** G	b4acbe7b532ecffc6f1c7893d2531838807ffccd
 --- G	609b4ae23447168db4bf7395433c41bdfcc249d0
-*************** hunk 0 -- initial 6
+*************** hunk 0 -- initial 9
 *** 8,20 ****
   hunk 0 -- initial 7
   hunk 0 -- initial 8
@@ -16,7 +16,7 @@
   hunk 1 -- initial 8
   hunk 1 -- initial 9
 --- 8,15 ----
-*************** hunk 2 -- initial 7
+*************** hunk 3 -- initial 0
 *** 29,40 ****
 --- 24,40 ----
   hunk 2 -- initial 8
@@ -36,7 +36,7 @@
   hunk 3 -- initial 7
   hunk 3 -- initial 8
   hunk 3 -- initial 9
-*************** hunk 4 -- initial 8
+*************** hunk 5 -- initial 1
 *** 50,59 ****
 --- 50,64 ----
   hunk 4 -- initial 9
@@ -54,7 +54,7 @@
   hunk 5 -- initial 6
   hunk 5 -- initial 7
   hunk 5 -- initial 8
-*************** hunk 10 -- initial 7
+*************** hunk 11 -- initial 0
 *** 109,118 ****
 --- 114,128 ----
   hunk 10 -- initial 8
@@ -72,7 +72,7 @@
   hunk 11 -- initial 5
   hunk 11 -- initial 6
   hunk 11 -- initial 7
-*************** hunk 12 -- initial 0
+*************** hunk 12 -- initial 3
 *** 122,142 ****
   hunk 12 -- initial 1
   hunk 12 -- initial 2
@@ -117,7 +117,7 @@
   hunk 13 -- initial 9
   hunk 14 -- initial 0
   hunk 14 -- initial 1
-*************** hunk 14 -- initial 7
+*************** hunk 15 -- initial 0
 *** 149,171 ****
   hunk 14 -- initial 8
   hunk 14 -- initial 9
@@ -166,7 +166,7 @@
   hunk 16 -- initial 8
   hunk 16 -- initial 9
   hunk 17 -- initial 0
-*************** hunk 20 -- initial 9
+*************** hunk 21 -- initial 2
 *** 211,220 ****
 --- 221,235 ----
   hunk 21 -- initial 0
============================================================
--- tests/diff_output_formats_CREATEDONBRANCH/G.udp	3fb6ca62deb44f8f6ed938498d5da2e2ac5a8634
+++ tests/diff_output_formats/G.udp	d24b419206a63b1737b6d9cb47a6582984b2c0b4
@@ -1,6 +1,6 @@
 --- G	b4acbe7b532ecffc6f1c7893d2531838807ffccd
 +++ G	609b4ae23447168db4bf7395433c41bdfcc249d0
-@@ -8,13 +8,8 @@ hunk 0 -- initial 6
+@@ -8,13 +8,8 @@ hunk 0 -- initial 9
  hunk 0 -- initial 7
  hunk 0 -- initial 8
  hunk 0 -- initial 9
@@ -14,7 +14,7 @@
  hunk 1 -- initial 7
  hunk 1 -- initial 8
  hunk 1 -- initial 9
-@@ -29,12 +24,17 @@ hunk 2 -- initial 7
+@@ -29,12 +24,17 @@ hunk 3 -- initial 0
  hunk 2 -- initial 8
  hunk 2 -- initial 9
  hunk 3 -- initial 0
@@ -32,7 +32,7 @@
  hunk 3 -- initial 7
  hunk 3 -- initial 8
  hunk 3 -- initial 9
-@@ -50,10 +50,15 @@ hunk 4 -- initial 8
+@@ -50,10 +50,15 @@ hunk 5 -- initial 1
  hunk 4 -- initial 9
  hunk 5 -- initial 0
  hunk 5 -- initial 1
@@ -48,7 +48,7 @@
  hunk 5 -- initial 6
  hunk 5 -- initial 7
  hunk 5 -- initial 8
-@@ -109,10 +114,15 @@ hunk 10 -- initial 7
+@@ -109,10 +114,15 @@ hunk 11 -- initial 0
  hunk 10 -- initial 8
  hunk 10 -- initial 9
  hunk 11 -- initial 0
@@ -64,7 +64,7 @@
  hunk 11 -- initial 5
  hunk 11 -- initial 6
  hunk 11 -- initial 7
-@@ -122,21 +132,21 @@ hunk 12 -- initial 0
+@@ -122,21 +132,21 @@ hunk 12 -- initial 3
  hunk 12 -- initial 1
  hunk 12 -- initial 2
  hunk 12 -- initial 3
@@ -91,7 +91,7 @@
  hunk 13 -- initial 9
  hunk 14 -- initial 0
  hunk 14 -- initial 1
-@@ -149,23 +159,23 @@ hunk 14 -- initial 7
+@@ -149,23 +159,23 @@ hunk 15 -- initial 0
  hunk 14 -- initial 8
  hunk 14 -- initial 9
  hunk 15 -- initial 0
@@ -120,7 +120,7 @@
  hunk 16 -- initial 8
  hunk 16 -- initial 9
  hunk 17 -- initial 0
-@@ -211,10 +221,15 @@ hunk 20 -- initial 9
+@@ -211,10 +221,15 @@ hunk 21 -- initial 2
  hunk 21 -- initial 0
  hunk 21 -- initial 1
  hunk 21 -- initial 2
============================================================
--- tests/diff_output_formats_CREATEDONBRANCH/H.cdp	9cafc25f889fef524ee2391fbfa271c5876cf35e
+++ tests/diff_output_formats/H.cdp	7ff850c76a1a87ec5bfb9425fe6d7042337c2ba0
@@ -1,6 +1,6 @@
 *** H	b0cf0d98709b3d0746269fbc0b6cbd5d2d6e6379
 --- H	2f076c5d449b7841f873a173f4c8ac162d778304
-*************** hunk 4 -- initial 0
+*************** hunk 4 -- initial 3
 *** 42,51 ****
 --- 42,56 ----
   hunk 4 -- initial 1
@@ -18,7 +18,7 @@
   hunk 4 -- initial 8
   hunk 4 -- initial 9
   hunk 5 -- initial 0
-*************** hunk 5 -- initial 7
+*************** hunk 6 -- initial 0
 *** 59,92 ****
   hunk 5 -- initial 8
   hunk 5 -- initial 9
@@ -84,7 +84,7 @@
   hunk 8 -- initial 9
   hunk 9 -- initial 0
   hunk 9 -- initial 1
-*************** hunk 9 -- initial 3
+*************** hunk 9 -- initial 6
 *** 95,102 ****
 --- 95,107 ----
   hunk 9 -- initial 4
@@ -100,7 +100,7 @@
   hunk 9 -- initial 9
   hunk 10 -- initial 0
   hunk 10 -- initial 1
-*************** hunk 11 -- initial 6
+*************** hunk 11 -- initial 9
 *** 118,161 ****
   hunk 11 -- initial 7
   hunk 11 -- initial 8
@@ -201,7 +201,7 @@
   hunk 15 -- initial 8
   hunk 15 -- initial 9
   hunk 16 -- initial 0
-*************** hunk 19 -- initial 0
+*************** hunk 19 -- initial 3
 *** 192,202 ****
 --- 207,222 ----
   hunk 19 -- initial 1
============================================================
--- tests/diff_output_formats_CREATEDONBRANCH/H.udp	89c15555eb4658c6fdc8d38bf1e85060b79fdd05
+++ tests/diff_output_formats/H.udp	38852f19edb7c8b689ea77bf35e84faca74bbe78
@@ -1,6 +1,6 @@
 --- H	b0cf0d98709b3d0746269fbc0b6cbd5d2d6e6379
 +++ H	2f076c5d449b7841f873a173f4c8ac162d778304
-@@ -42,10 +42,15 @@ hunk 4 -- initial 0
+@@ -42,10 +42,15 @@ hunk 4 -- initial 3
  hunk 4 -- initial 1
  hunk 4 -- initial 2
  hunk 4 -- initial 3
@@ -16,7 +16,7 @@
  hunk 4 -- initial 8
  hunk 4 -- initial 9
  hunk 5 -- initial 0
-@@ -59,34 +64,29 @@ hunk 5 -- initial 7
+@@ -59,34 +64,29 @@ hunk 6 -- initial 0
  hunk 5 -- initial 8
  hunk 5 -- initial 9
  hunk 6 -- initial 0
@@ -56,7 +56,7 @@
  hunk 8 -- initial 9
  hunk 9 -- initial 0
  hunk 9 -- initial 1
-@@ -95,8 +95,13 @@ hunk 9 -- initial 3
+@@ -95,8 +95,13 @@ hunk 9 -- initial 6
  hunk 9 -- initial 4
  hunk 9 -- initial 5
  hunk 9 -- initial 6
@@ -70,7 +70,7 @@
  hunk 9 -- initial 9
  hunk 10 -- initial 0
  hunk 10 -- initial 1
-@@ -118,44 +123,54 @@ hunk 11 -- initial 6
+@@ -118,44 +123,54 @@ hunk 11 -- initial 9
  hunk 11 -- initial 7
  hunk 11 -- initial 8
  hunk 11 -- initial 9
@@ -130,7 +130,7 @@
  hunk 15 -- initial 8
  hunk 15 -- initial 9
  hunk 16 -- initial 0
-@@ -192,11 +207,16 @@ hunk 19 -- initial 0
+@@ -192,11 +207,16 @@ hunk 19 -- initial 3
  hunk 19 -- initial 1
  hunk 19 -- initial 2
  hunk 19 -- initial 3
============================================================
--- tests/diff_output_formats_CREATEDONBRANCH/I.cdp	06fdd7b950ce01d587d13ab1aec3203dfb0aa918
+++ tests/diff_output_formats/I.cdp	6dccb3708aaa75784ff4bae6ce81d0dd55a541fe
@@ -1,6 +1,6 @@
 *** I	4d32e91882cbb8a15c643265088861861bef0c16
 --- I	ccdcc1ef902cf1c0082b992e731b057d30b40814
-***************
+*************** hunk 0 -- initial 0
 *** 1,10 ****
   hunk 0 -- initial 0
 - hunk 0 -- initial 1
@@ -13,7 +13,7 @@
   hunk 0 -- initial 8
   hunk 0 -- initial 9
 --- 1,5 ----
-*************** hunk 1 -- initial 7
+*************** hunk 2 -- initial 0
 *** 19,31 ****
   hunk 1 -- initial 8
   hunk 1 -- initial 9
@@ -29,7 +29,7 @@
   hunk 2 -- initial 9
   hunk 3 -- initial 0
 --- 14,21 ----
-*************** hunk 4 -- initial 6
+*************** hunk 4 -- initial 9
 *** 48,62 ****
   hunk 4 -- initial 7
   hunk 4 -- initial 8
@@ -47,7 +47,7 @@
   hunk 6 -- initial 0
   hunk 6 -- initial 1
 --- 38,47 ----
-*************** hunk 6 -- initial 7
+*************** hunk 7 -- initial 0
 *** 69,109 ****
   hunk 6 -- initial 8
   hunk 6 -- initial 9
@@ -122,7 +122,7 @@
   hunk 10 -- initial 6
   hunk 10 -- initial 7
   hunk 10 -- initial 8
-*************** hunk 13 -- initial 6
+*************** hunk 13 -- initial 9
 *** 138,146 ****
 --- 113,126 ----
   hunk 13 -- initial 7
@@ -139,7 +139,7 @@
   hunk 14 -- initial 3
   hunk 14 -- initial 4
   hunk 14 -- initial 5
-*************** hunk 16 -- initial 6
+*************** hunk 16 -- initial 9
 *** 168,182 ****
   hunk 16 -- initial 7
   hunk 16 -- initial 8
@@ -157,7 +157,7 @@
   hunk 18 -- initial 0
   hunk 18 -- initial 1
 --- 148,157 ----
-*************** hunk 18 -- initial 8
+*************** hunk 19 -- initial 1
 *** 190,210 ****
 --- 165,195 ----
   hunk 18 -- initial 9
@@ -191,7 +191,7 @@
   hunk 20 -- initial 7
   hunk 20 -- initial 8
   hunk 20 -- initial 9
-*************** hunk 21 -- initial 7
+*************** hunk 22 -- initial 0
 *** 219,234 ****
 --- 204,227 ----
   hunk 21 -- initial 8
@@ -218,7 +218,7 @@
   hunk 23 -- initial 1
   hunk 23 -- initial 2
   hunk 23 -- initial 3
-*************** hunk 23 -- initial 4
+*************** hunk 23 -- initial 7
 *** 236,242 ****
 --- 229,237 ----
   hunk 23 -- initial 5
============================================================
--- tests/diff_output_formats_CREATEDONBRANCH/I.udp	8e40b30a4ce01d94d30ecb336f5918fabf13555d
+++ tests/diff_output_formats/I.udp	779e7da5d0ff4faeaca73ae3099891cc91ebdeb3
@@ -1,6 +1,6 @@
 --- I	4d32e91882cbb8a15c643265088861861bef0c16
 +++ I	ccdcc1ef902cf1c0082b992e731b057d30b40814
-@@ -1,10 +1,5 @@
+@@ -1,10 +1,5 @@ hunk 0 -- initial 0
  hunk 0 -- initial 0
 -hunk 0 -- initial 1
 -hunk 0 -- initial 2
@@ -11,7 +11,7 @@
  hunk 0 -- initial 7
  hunk 0 -- initial 8
  hunk 0 -- initial 9
-@@ -19,13 +14,8 @@ hunk 1 -- initial 7
+@@ -19,13 +14,8 @@ hunk 2 -- initial 0
  hunk 1 -- initial 8
  hunk 1 -- initial 9
  hunk 2 -- initial 0
@@ -25,7 +25,7 @@
  hunk 2 -- initial 8
  hunk 2 -- initial 9
  hunk 3 -- initial 0
-@@ -48,15 +38,10 @@ hunk 4 -- initial 6
+@@ -48,15 +38,10 @@ hunk 4 -- initial 9
  hunk 4 -- initial 7
  hunk 4 -- initial 8
  hunk 4 -- initial 9
@@ -41,7 +41,7 @@
  hunk 5 -- initial 9
  hunk 6 -- initial 0
  hunk 6 -- initial 1
-@@ -69,41 +54,31 @@ hunk 6 -- initial 7
+@@ -69,41 +54,31 @@ hunk 7 -- initial 0
  hunk 6 -- initial 8
  hunk 6 -- initial 9
  hunk 7 -- initial 0
@@ -88,7 +88,7 @@
  hunk 10 -- initial 6
  hunk 10 -- initial 7
  hunk 10 -- initial 8
-@@ -138,9 +113,14 @@ hunk 13 -- initial 6
+@@ -138,9 +113,14 @@ hunk 13 -- initial 9
  hunk 13 -- initial 7
  hunk 13 -- initial 8
  hunk 13 -- initial 9
@@ -103,7 +103,7 @@
  hunk 14 -- initial 3
  hunk 14 -- initial 4
  hunk 14 -- initial 5
-@@ -168,15 +148,10 @@ hunk 16 -- initial 6
+@@ -168,15 +148,10 @@ hunk 16 -- initial 9
  hunk 16 -- initial 7
  hunk 16 -- initial 8
  hunk 16 -- initial 9
@@ -119,7 +119,7 @@
  hunk 17 -- initial 9
  hunk 18 -- initial 0
  hunk 18 -- initial 1
-@@ -190,21 +165,31 @@ hunk 18 -- initial 8
+@@ -190,21 +165,31 @@ hunk 19 -- initial 1
  hunk 18 -- initial 9
  hunk 19 -- initial 0
  hunk 19 -- initial 1
@@ -151,7 +151,7 @@
  hunk 20 -- initial 7
  hunk 20 -- initial 8
  hunk 20 -- initial 9
-@@ -219,16 +204,24 @@ hunk 21 -- initial 7
+@@ -219,16 +204,24 @@ hunk 22 -- initial 0
  hunk 21 -- initial 8
  hunk 21 -- initial 9
  hunk 22 -- initial 0
@@ -176,7 +176,7 @@
  hunk 23 -- initial 1
  hunk 23 -- initial 2
  hunk 23 -- initial 3
-@@ -236,7 +229,9 @@ hunk 23 -- initial 4
+@@ -236,7 +229,9 @@ hunk 23 -- initial 7
  hunk 23 -- initial 5
  hunk 23 -- initial 6
  hunk 23 -- initial 7
============================================================
--- tests/diff_output_formats_CREATEDONBRANCH/J.cdp	bb1b2a8556d1750b60933ffb60ef2cbe01621a79
+++ tests/diff_output_formats/J.cdp	7f0dfaa05c7901ac95da42260be390f8627254f2
@@ -1,6 +1,6 @@
 *** J	cc172a94441af071b19c3eddddc21053634e94bb
 --- J	93462d067100103422a0e59722155b3a916770a2
-*************** hunk 1 -- initial 7
+*************** hunk 2 -- initial 0
 *** 19,41 ****
   hunk 1 -- initial 8
   hunk 1 -- initial 9
@@ -49,7 +49,7 @@
   hunk 3 -- initial 8
   hunk 3 -- initial 9
   hunk 4 -- initial 0
-*************** hunk 5 -- initial 6
+*************** hunk 5 -- initial 9
 *** 58,72 ****
   hunk 5 -- initial 7
   hunk 5 -- initial 8
@@ -67,7 +67,7 @@
   hunk 7 -- initial 0
   hunk 7 -- initial 1
 --- 58,67 ----
-*************** hunk 8 -- initial 1
+*************** hunk 8 -- initial 4
 *** 83,102 ****
 --- 78,107 ----
   hunk 8 -- initial 2
@@ -100,7 +100,7 @@
   hunk 9 -- initial 9
   hunk 10 -- initial 0
   hunk 10 -- initial 1
-*************** hunk 10 -- initial 6
+*************** hunk 10 -- initial 9
 *** 108,131 ****
   hunk 10 -- initial 7
   hunk 10 -- initial 8
@@ -127,7 +127,7 @@
   hunk 12 -- initial 9
   hunk 13 -- initial 0
 --- 113,126 ----
-*************** hunk 13 -- initial 7
+*************** hunk 14 -- initial 0
 *** 139,151 ****
   hunk 13 -- initial 8
   hunk 13 -- initial 9
@@ -143,7 +143,7 @@
   hunk 14 -- initial 9
   hunk 15 -- initial 0
 --- 134,141 ----
-*************** hunk 18 -- initial 0
+*************** hunk 18 -- initial 3
 *** 182,192 ****
 --- 172,187 ----
   hunk 18 -- initial 1
@@ -162,7 +162,7 @@
   hunk 18 -- initial 9
   hunk 19 -- initial 0
   hunk 19 -- initial 1
-*************** hunk 22 -- initial 7
+*************** hunk 23 -- initial 0
 *** 229,241 ****
 --- 224,241 ----
   hunk 22 -- initial 8
@@ -183,7 +183,7 @@
   hunk 23 -- initial 8
   hunk 23 -- initial 9
   hunk 24 -- initial 0
-*************** hunk 24 -- initial 8
+*************** hunk 25 -- initial 1
 *** 250,272 ****
   hunk 24 -- initial 9
   hunk 25 -- initial 0
============================================================
--- tests/diff_output_formats_CREATEDONBRANCH/J.udp	29fffc4740f7617713a79f51bf34ca6d9f99af15
+++ tests/diff_output_formats/J.udp	ae9011cf6eaaf22aba27bc9881a849b2ad32c23f
@@ -1,6 +1,6 @@
 --- J	cc172a94441af071b19c3eddddc21053634e94bb
 +++ J	93462d067100103422a0e59722155b3a916770a2
-@@ -19,23 +19,23 @@ hunk 1 -- initial 7
+@@ -19,23 +19,23 @@ hunk 2 -- initial 0
  hunk 1 -- initial 8
  hunk 1 -- initial 9
  hunk 2 -- initial 0
@@ -29,7 +29,7 @@
  hunk 3 -- initial 8
  hunk 3 -- initial 9
  hunk 4 -- initial 0
-@@ -58,15 +58,10 @@ hunk 5 -- initial 6
+@@ -58,15 +58,10 @@ hunk 5 -- initial 9
  hunk 5 -- initial 7
  hunk 5 -- initial 8
  hunk 5 -- initial 9
@@ -45,7 +45,7 @@
  hunk 6 -- initial 9
  hunk 7 -- initial 0
  hunk 7 -- initial 1
-@@ -83,20 +78,30 @@ hunk 8 -- initial 1
+@@ -83,20 +78,30 @@ hunk 8 -- initial 4
  hunk 8 -- initial 2
  hunk 8 -- initial 3
  hunk 8 -- initial 4
@@ -76,7 +76,7 @@
  hunk 9 -- initial 9
  hunk 10 -- initial 0
  hunk 10 -- initial 1
-@@ -108,24 +113,14 @@ hunk 10 -- initial 6
+@@ -108,24 +113,14 @@ hunk 10 -- initial 9
  hunk 10 -- initial 7
  hunk 10 -- initial 8
  hunk 10 -- initial 9
@@ -101,7 +101,7 @@
  hunk 12 -- initial 8
  hunk 12 -- initial 9
  hunk 13 -- initial 0
-@@ -139,13 +134,8 @@ hunk 13 -- initial 7
+@@ -139,13 +134,8 @@ hunk 14 -- initial 0
  hunk 13 -- initial 8
  hunk 13 -- initial 9
  hunk 14 -- initial 0
@@ -115,7 +115,7 @@
  hunk 14 -- initial 8
  hunk 14 -- initial 9
  hunk 15 -- initial 0
-@@ -182,11 +172,16 @@ hunk 18 -- initial 0
+@@ -182,11 +172,16 @@ hunk 18 -- initial 3
  hunk 18 -- initial 1
  hunk 18 -- initial 2
  hunk 18 -- initial 3
@@ -132,7 +132,7 @@
  hunk 18 -- initial 9
  hunk 19 -- initial 0
  hunk 19 -- initial 1
-@@ -229,13 +224,18 @@ hunk 22 -- initial 7
+@@ -229,13 +224,18 @@ hunk 23 -- initial 0
  hunk 22 -- initial 8
  hunk 22 -- initial 9
  hunk 23 -- initial 0
@@ -151,7 +151,7 @@
  hunk 23 -- initial 8
  hunk 23 -- initial 9
  hunk 24 -- initial 0
-@@ -250,23 +250,13 @@ hunk 24 -- initial 8
+@@ -250,23 +250,13 @@ hunk 25 -- initial 1
  hunk 24 -- initial 9
  hunk 25 -- initial 0
  hunk 25 -- initial 1
============================================================
--- tests/diff_output_formats/__driver__.lua	17d8d713c190f1a91fdf10ce0702d7a0aacc5b09
+++ tests/diff_output_formats/__driver__.lua	6dbcdb090b2cd79c16c3aa84a6717da390e5614b
@@ -1,9 +1,14 @@
 function test_one(base)
    local src = base .. ".src"
    local dst = base .. ".dst"
    local ud  = base .. ".ud"
    local cd  = base .. ".cd"
-   if not get(src) or not get(dst) or not get(ud) or not get(cd) then
+   local udp = base .. ".udp"
+   local cdp = base .. ".cdp"
+   if not get(src) or not get(dst) 
+      or not get(ud) or not get(cd) 
+      or not get(udp) or not get(cdp)
+   then
       error("case '" .. base .. "': missing file", 2)
       return
    end
@@ -14,8 +19,21 @@
 
    check(mtn("fdiff", base, base, src, dst), 0, {ud}, nil, nil)
    check(mtn("fdiff", "--context", base, base, src, dst), 0, {cd}, nil, nil)
+   check(mtn("fdiff", "--show-encloser", base, base, src, dst), 
+	 0, {udp}, nil, nil)
+   check(mtn("fdiff", "--context", "--show-encloser", base, base, src, dst),
+	 0, {cdp}, nil, nil)
 end
 
+append("test_hooks.lua",
+       "function get_encloser_pattern(name)\n"..
+       "  if name == \"hello\" then\n"..
+       "    return \"^[[:alnum:]$_]\"\n"..
+       "  else\n"..
+       "    return \"-- initial\"\n"..
+       "  end\n"..
+       "end\n")
+
 mtn_setup()
 
 test_one("hello")