#
#
# patch "cmd_merging.cc"
#  from [879fe2a82d2728fd5f2d083a7e33d11c708f3509]
#    to [5ebc0d909d0ea52fd29bcb5177a9df5595b97121]
#
============================================================
--- cmd_merging.cc	879fe2a82d2728fd5f2d083a7e33d11c708f3509
+++ cmd_merging.cc	5ebc0d909d0ea52fd29bcb5177a9df5595b97121
@@ -386,7 +386,7 @@ static void
 // (Possibility: append the --message/--message-file text to the synthetic
 // log message constructed in merge_two().)
 static void
-commit(app_state & app, commands::command_id const & execid,
+merge(app_state & app, commands::command_id const & execid,
           args_vector const & args, std::ostream & output,
           bool automate)
 {