[PATCH 2/4] usability: fix am and checkout for nevermind questions

[Jean-Noel Avila]

Signed-off-by: Jean-Noel Avila <jn.av...@free.fr>
---
 builtin/am.c       | 4 ++--
 builtin/checkout.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/builtin/am.c b/builtin/am.c
index a95dd8b4e..f5afa438d 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1312,7 +1312,7 @@ static int parse_mail(struct am_state *state, const char 
*mail)
        }
 
        if (is_empty_file(am_path(state, "patch"))) {
-               printf_ln(_("Patch is empty. Was it split wrong?"));
+               printf_ln(_("Patch is empty. It may have been split wrong."));
                die_user_resolve(state);
        }
 
@@ -1940,7 +1940,7 @@ static void am_resolve(struct am_state *state)
 
        if (unmerged_cache()) {
                printf_ln(_("You still have unmerged paths in your index.\n"
-                       "Did you forget to use 'git add'?"));
+                       "You might want to use 'git add' on them."));
                die_user_resolve(state);
        }
 
diff --git a/builtin/checkout.c b/builtin/checkout.c
index bfa5419f3..05037b9b6 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1287,7 +1287,7 @@ int cmd_checkout(int argc, const char **argv, const char 
*prefix)
                 */
                if (opts.new_branch && argc == 1)
                        die(_("Cannot update paths and switch to branch '%s' at 
the same time.\n"
-                             "Did you intend to checkout '%s' which can not be 
resolved as commit?"),
+                             "'%s' can not be resolved as commit, but it 
should."),
                            opts.new_branch, argv[0]);
 
                if (opts.force_detach)
-- 
2.12.0