diff options
| author |  Stephan Beyer <s-beyer@gmx.net> | 2016-12-07 22:51:29 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-12-08 09:09:34 -0800 |
| commit | ccd71b2f38f86a28db2cce811f414fe5369eaa1d (patch) | |
| tree | 311ff6e61dceee449e71bfac963667224310b0fd | |
| parent | Sync with maint-2.10 (diff) | |
| download | tgif-ccd71b2f38f86a28db2cce811f414fe5369eaa1d.tar.xz | |
am: fix filename in safe_to_abort() error message
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/am.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/am.c b/builtin/am.c index 6981f42ce9..7cf40e6f27 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2124,7 +2124,7 @@ static int safe_to_abort(const struct am_state *state) if (read_state_file(&sb, state, "abort-safety", 1) > 0) { if (get_oid_hex(sb.buf, &abort_safety)) - die(_("could not parse %s"), am_path(state, "abort_safety")); + die(_("could not parse %s"), am_path(state, "abort-safety")); } else oidclr(&abort_safety); |