Code

Merge branch 'mm/conflict-advice'
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 22:42:59 +0000 (14:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 22:42:59 +0000 (14:42 -0800)
commit71b3ef11fa0aade4a514c51b83438858a4a3c03b
tree6cea8215ecc0e70c8f19e04c51327deda93672d3
parentf922df8655675aafaea96f3715c9473c63d2ca47
parentd38a30df7dd54c5c6883af1de1a03ec7d523cee5
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
Documentation/config.txt
advice.c
advice.h
builtin-commit.c
builtin-merge.c
builtin-revert.c