diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:42:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:42:59 -0800 |
| commit | 71b3ef11fa0aade4a514c51b83438858a4a3c03b (patch) | |
| tree | 6cea8215ecc0e70c8f19e04c51327deda93672d3 /blob.c | |
| parent | Merge branch 'da/difftool' (diff) | |
| parent | Be more user-friendly when refusing to do something because of conflict. (diff) | |
| download | git-71b3ef11fa0aade4a514c51b83438858a4a3c03b.tar.gz git-71b3ef11fa0aade4a514c51b83438858a4a3c03b.zip | |
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 'blob.c')
0 files changed, 0 insertions, 0 deletions