Merge branch 'jk/error-resolve-conflict-advice'

* jk/error-resolve-conflict-advice:
error_resolve_conflict: drop quotations around operation
error_resolve_conflict: rewrap advice message

diff --combined advice.c
index 486f823c78118212080a48e74debd7adae241cda,07d0109d69364a1e225557d1fd6d5d459c9117fa..c50ebdf5fe82d88b901ca26668806c94e03fbb37
--- 1/advice.c
--- 2/advice.c
+++ b/advice.c
@@@ -2,6 -2,7 +2,6 @@@
  
  int advice_push_update_rejected = 1;
  int advice_push_non_ff_current = 1;
 -int advice_push_non_ff_default = 1;
  int advice_push_non_ff_matching = 1;
  int advice_push_already_exists = 1;
  int advice_push_fetch_first = 1;
@@@ -22,6 -23,7 +22,6 @@@ static struct 
  } advice_config[] = {
        { "pushupdaterejected", &advice_push_update_rejected },
        { "pushnonffcurrent", &advice_push_non_ff_current },
 -      { "pushnonffdefault", &advice_push_non_ff_default },
        { "pushnonffmatching", &advice_push_non_ff_matching },
        { "pushalreadyexists", &advice_push_already_exists },
        { "pushfetchfirst", &advice_push_fetch_first },
@@@ -76,16 -78,15 +76,15 @@@ int git_default_advice_config(const cha
  
  int error_resolve_conflict(const char *me)
  {
-       error("'%s' is not possible because you have unmerged files.", me);
+       error("%s is not possible because you have unmerged files.", me);
        if (advice_resolve_conflict)
                /*
                 * Message used both when 'git commit' fails and when
                 * other commands doing a merge do.
                 */
-               advise(_("Fix them up in the work tree,\n"
-                        "and then use 'git add/rm <file>' as\n"
-                        "appropriate to mark resolution and make a commit,\n"
-                        "or use 'git commit -a'."));
+               advise(_("Fix them up in the work tree, and then use 'git add/rm <file>'\n"
+                        "as appropriate to mark resolution and make a commit, or use\n"
+                        "'git commit -a'."));
        return -1;
  }