Merge branch 'mm/conflict-advice'

* mm/conflict-advice:
  Be more user-friendly when refusing to do something because of conflict.

Conflicts:
	Documentation/config.txt
	advice.c
	advice.h

diff --cc Documentation/config.txt
index d4332140a01635feab079e394f02d8c927cf37c5,9c27686fab2c813139bb64642e48aad3d5ba6a80..76c7d9c7e53b1e8b5c688870a6d2dba840787b54
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -130,10 -130,10 +130,14 @@@ advice.*:
                Advice shown when linkgit:git-merge[1] refuses to
                merge to avoid overwritting local changes.
                Default: true.
+       resolveConflict::
+               Advices shown by various commands when conflicts
+               prevent the operation from being performed.
+               Default: true.
 +      implicitIdentity::
 +              Advice on how to set your identity configuration when
 +              your information is guessed from the system username and
 +              domain name. Default: true.
  --
  
  core.fileMode::

diff --cc advice.c
index 8f7de0e9ed70218f1f5355df670c537d1b818c76,3309521f456b0218fa765ba7f3dd7d7a3e94dea2..936d98ba2ba2c597f69188c8e7f9f1abcc7169a8
--- 1/advice.c
--- 2/advice.c
+++ b/advice.c
@@@ -3,7 -3,7 +3,8 @@@
  int advice_push_nonfastforward = 1;
  int advice_status_hints = 1;
  int advice_commit_before_merge = 1;
+ int advice_resolve_conflict = 1;
 +int advice_implicit_identity = 1;
  
  static struct {
        const char *name;
@@@ -12,7 -12,7 +13,8 @@@
        { "pushnonfastforward", &advice_push_nonfastforward },
        { "statushints", &advice_status_hints },
        { "commitbeforemerge", &advice_commit_before_merge },
+       { "resolveconflict", &advice_resolve_conflict },
 +      { "implicitidentity", &advice_implicit_identity },
  };
  
  int git_default_advice_config(const char *var, const char *value)

diff --cc advice.h
index 728ab90ef17b4ebccff4ccb662108f8c5fded690,acd5fdde3fbb04acaeec19b5ab1bd463c54eb8b6..9b7a3ad1ca126cb882e87d400820043043061f78
--- 1/advice.h
--- 2/advice.h
+++ b/advice.h
@@@ -4,7 -6,7 +6,8 @@@
  extern int advice_push_nonfastforward;
  extern int advice_status_hints;
  extern int advice_commit_before_merge;
+ extern int advice_resolve_conflict;
 +extern int advice_implicit_identity;
  
  int git_default_advice_config(const char *var, const char *value);
  

diff --cc builtin-commit.c
Simple merge

diff --cc builtin-merge.c
Simple merge

diff --cc builtin-revert.c
Simple merge