diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-09-13 01:33:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-09-13 01:33:15 -0700 |
| commit | 8b54f63dce34c3bbd7ff919fb53c1c253221fe71 (patch) | |
| tree | 8e540c253e699f1de5276fd96194f9df82f18fe3 /cache.h | |
| parent | 1cdd64e8000716945e1cb96c46a4273a2db0ec74 (diff) | |
| parent | fadd069d036c9d376769692e2726c5a1600d281c (diff) | |
| download | git-8b54f63dce34c3bbd7ff919fb53c1c253221fe71.tar.gz git-8b54f63dce34c3bbd7ff919fb53c1c253221fe71.tar.xz | |
Merge branch 'jc/merge-saner-messages'
* jc/merge-saner-messages:
merge-recursive: give less scary messages when merge did not start
Diffstat (limited to 'cache.h')
0 files changed, 0 insertions, 0 deletions