diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-06-16 10:06:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-16 10:06:15 -0700 |
| commit | 9d1d882e9c1d4a34e2ae3af47d50c1f115a6cf84 (patch) | |
| tree | 7ad62be63d7139f16eef7d9b5bfaaa3865ad2d3b /builtin/merge-ours.c | |
| parent | Merge branch 'jk/diff-files-assume-unchanged' (diff) | |
| parent | open_sha1_file: report "most interesting" errno (diff) | |
| download | tgif-9d1d882e9c1d4a34e2ae3af47d50c1f115a6cf84.tar.xz | |
Merge branch 'jk/report-fail-to-read-objects-better'
* jk/report-fail-to-read-objects-better:
open_sha1_file: report "most interesting" errno
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions