![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 20 Jan 2010 22:42:59 +0000 (14:42 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 20 Jan 2010 22:42:59 +0000 (14:42 -0800) | ||
| commit | 71b3ef11fa0aade4a514c51b83438858a4a3c03b | |
| tree | 6cea8215ecc0e70c8f19e04c51327deda93672d3 | tree | snapshot |
| parent | f922df8655675aafaea96f3715c9473c63d2ca47 | commit | diff |
| parent | d38a30df7dd54c5c6883af1de1a03ec7d523cee5 | commit | diff |
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
* 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 | diff1 | | diff2 | | blob | history |
| advice.c | diff1 | | diff2 | | blob | history |
| advice.h | diff1 | | diff2 | | blob | history |
| builtin-commit.c | diff1 | | diff2 | | blob | history |
| builtin-merge.c | diff1 | | diff2 | | blob | history |
| builtin-revert.c | diff1 | | diff2 | | blob | history |