diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-02-11 14:26:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-11 14:26:10 -0800 |
| commit | b76bf72428e2efd978fee421606662e78ba0b2cf (patch) | |
| tree | b4a5a2769d3639468e2a4aea83d1ba895de553ca /git-mergetool--lib.sh | |
| parent | 3446a54c9afe3f78ca27fc51f618884ba49493de (diff) | |
| parent | ea6f0a23ac63b3a19202db5441704e3d79236ad4 (diff) | |
| download | git-b76bf72428e2efd978fee421606662e78ba0b2cf.tar.gz git-b76bf72428e2efd978fee421606662e78ba0b2cf.tar.xz | |
Merge branch 'jc/fsck-fixes' into maint
* jc/fsck-fixes:
fsck: do not give up too early in fsck_dir()
fsck: drop unused parameter from traverse_one_object()
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions