# 
# 
# patch "ChangeLog"
#  from [603ba701b7da08d620b0450a3eddfd8bb7eea463]
#    to [696008a6fd808a79a8fe99d8cf607c4e1842a1a3]
# 
============================================================
--- ChangeLog	603ba701b7da08d620b0450a3eddfd8bb7eea463
+++ ChangeLog	696008a6fd808a79a8fe99d8cf607c4e1842a1a3
@@ -1,9 +1,11 @@
 2006-05-29  Richard Levitte  <address@hidden>
 
 	* std_hooks.lua (merge3): Check the exit code from the merging
 	program to detect failure.  We could do that by strictly checking
 	if the output file exists, but since some programs, like meld,
 	don't produce a specific output file, that method is unsafe.
+	(execute_confirm): Check the exit code from the execute call,
+	and tell the user if something went wrong.
 
 2006-05-28  Richard Levitte  <address@hidden>