diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 22:42:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 22:42:59 (GMT) |
| commit | 71b3ef11fa0aade4a514c51b83438858a4a3c03b (patch) | |
| tree | 6cea8215ecc0e70c8f19e04c51327deda93672d3 /attr.h | |
| parent | f922df8655675aafaea96f3715c9473c63d2ca47 (diff) | |
| parent | d38a30df7dd54c5c6883af1de1a03ec7d523cee5 (diff) | |
| download | git-71b3ef11fa0aade4a514c51b83438858a4a3c03b.zip git-71b3ef11fa0aade4a514c51b83438858a4a3c03b.tar.gz git-71b3ef11fa0aade4a514c51b83438858a4a3c03b.tar.bz2 | |
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
Diffstat (limited to 'attr.h')
0 files changed, 0 insertions, 0 deletions