die(_("BUG")): avoid translating bug messages
[gitweb.git] / merge-recursive.c
index 4338b73ec4e035cfa920084ec71ff84b9d527a99..1b6db87ef0e9e7603ddada1aebfca6fbee423a93 100644 (file)
@@ -967,7 +967,7 @@ static struct merge_file_info merge_file_1(struct merge_options *o,
                        if (!oid_eq(&a->oid, &b->oid))
                                result.clean = 0;
                } else
-                       die(_("BUG: unsupported object type in the tree"));
+                       die("BUG: unsupported object type in the tree");
        }
 
        return result;
@@ -1811,7 +1811,7 @@ static int process_entry(struct merge_options *o,
                 */
                remove_file(o, 1, path, !a_mode);
        } else
-               die(_("BUG: fatal merge failure, shouldn't happen."));
+               die("BUG: fatal merge failure, shouldn't happen.");
 
        return clean_merge;
 }
@@ -1869,7 +1869,7 @@ int merge_trees(struct merge_options *o,
                for (i = 0; i < entries->nr; i++) {
                        struct stage_data *e = entries->items[i].util;
                        if (!e->processed)
-                               die(_("BUG: unprocessed path??? %s"),
+                               die("BUG: unprocessed path??? %s",
                                    entries->items[i].string);
                }