From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Jun 2014 19:18:47 +0000 (-0700)
Subject: Merge branch 'jk/error-resolve-conflict-advice'
X-Git-Tag: v2.1.0-rc0~107
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d0d5ba7e6ed1f9ea7b22dc8063b782b431ad37b7?ds=inline;hp=-c

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
---

d0d5ba7e6ed1f9ea7b22dc8063b782b431ad37b7
diff --combined advice.c
index 486f823c78,07d0109d69..c50ebdf5fe
--- a/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;
  }