# 
# 
# patch "ChangeLog"
#  from [1415e89f0c1023eddc0312dca8dabd278153a81a]
#    to [4145002dedd0b134adf5d79d8e04827c44dc2c0a]
# 
# patch "std_hooks.lua"
#  from [4ca1188ac09063710baa429986649f2c3ad13083]
#    to [a79a91f2c0f63681bd1af81cfed00c2066cb362e]
# 
============================================================
--- ChangeLog	1415e89f0c1023eddc0312dca8dabd278153a81a
+++ ChangeLog	4145002dedd0b134adf5d79d8e04827c44dc2c0a
@@ -1,5 +1,10 @@
 2006-03-03  Nathaniel Smith  <address@hidden>
 
+	* std_hooks.lua (merge3_xxdiff_cmd): Pass --exit-with-merge-status
+	so as to get a meaningful exit code.
+
+2006-03-03  Nathaniel Smith  <address@hidden>
+
 	* commands.cc (update): Make plain update with multiple heads an
 	Error, not a Naughty.
 	(checkout): If a branch has multiple heads, list candidates, give
============================================================
--- std_hooks.lua	4ca1188ac09063710baa429986649f2c3ad13083
+++ std_hooks.lua	a79a91f2c0f63681bd1af81cfed00c2066cb362e
@@ -350,7 +350,8 @@
                      "--title3", merged_path,
                      lfile, afile, rfile, 
                      "--merge", 
-                     "--merged-filename", outfile)
+                     "--merged-filename", outfile,
+                     "--exit-with-merge-status")
    end
 end
    
@@ -579,7 +580,7 @@
       return os.date("%FT%T", t)
    end
    
-   -- today don't uses the time		# for xgettext's sake, an extra quote
+   -- today don't uses the time         # for xgettext's sake, an extra quote
    if str == "today"
    then
       local t = os.time(os.date('!*t'))