diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-01-13 00:40:19 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-01-13 00:40:19 -0800 |
commit | 1cbe69f649fc45a3052e82c8e92e4a0f9eff67ed (patch) | |
tree | 71ca0e8d6b33a53c3927748ca027c49277061cdb /userdiff.h | |
parent | Merge branch 'mh/maint-sendmail-cc-doc' into maint (diff) | |
parent | Avoid spurious error messages on error mistakes. (diff) | |
download | tgif-1cbe69f649fc45a3052e82c8e92e4a0f9eff67ed.tar.xz |
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0:
Avoid spurious error messages on error mistakes.
contrib/examples/README: give an explanation of the status of these files
Diffstat (limited to 'userdiff.h')
0 files changed, 0 insertions, 0 deletions