diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:51 -0700 |
| commit | 39006893f9fce70d8d2fe055e4285e1fca0ca050 (patch) | |
| tree | e353cf8f1268385a4fa9405f617890a01ad9c30b /builtin | |
| parent | 49f210fd5279eeb0106cd7e4383a1c4454d30428 (diff) | |
| parent | bd7dfa543e0263858071b8648a55ef7ccae1085b (diff) | |
| download | git-39006893f9fce70d8d2fe055e4285e1fca0ca050.tar.xz | |
Merge branch 'tg/rerere'
Fixes to "git rerere" corner cases, especially when conflict
markers cannot be parsed in the file.
* tg/rerere:
rerere: recalculate conflict ID when unresolved conflict is committed
rerere: teach rerere to handle nested conflicts
rerere: return strbuf from handle path
rerere: factor out handle_conflict function
rerere: only return whether a path has conflicts or not
rerere: fix crash with files rerere can't handle
rerere: add documentation for conflict normalization
rerere: mark strings for translation
rerere: wrap paths in output in sq
rerere: lowercase error messages
rerere: unify error messages when read_cache fails
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rerere.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/rerere.c b/builtin/rerere.c index 0bc40298c2..5ed941b91f 100644 --- a/builtin/rerere.c +++ b/builtin/rerere.c @@ -75,7 +75,7 @@ int cmd_rerere(int argc, const char **argv, const char *prefix) if (!strcmp(argv[0], "forget")) { struct pathspec pathspec; if (argc < 2) - warning("'git rerere forget' without paths is deprecated"); + warning(_("'git rerere forget' without paths is deprecated")); parse_pathspec(&pathspec, 0, PATHSPEC_PREFER_CWD, prefix, argv + 1); return rerere_forget(&pathspec); @@ -107,7 +107,7 @@ int cmd_rerere(int argc, const char **argv, const char *prefix) const char *path = merge_rr.items[i].string; const struct rerere_id *id = merge_rr.items[i].util; if (diff_two(rerere_path(id, "preimage"), path, path, path)) - die("unable to generate diff for %s", rerere_path(id, NULL)); + die(_("unable to generate diff for '%s'"), rerere_path(id, NULL)); } } else usage_with_options(rerere_usage, options); |