diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-19 20:37:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-19 20:37:21 -0700 |
| commit | 2d220862d43b4d54f3173f67956fc5221690fb7e (patch) | |
| tree | 89043ab2b7c066d4234bcef030d9cfc7910f4b9e /builtin/merge-ours.c | |
| parent | Merge branch 'ld/p4-preserve-user-names' (diff) | |
| parent | sparse checkout: do not eagerly decide the fate for whole directory (diff) | |
| download | tgif-2d220862d43b4d54f3173f67956fc5221690fb7e.tar.xz | |
Merge branch 'nd/sparse-co-fix'
* nd/sparse-co-fix:
sparse checkout: do not eagerly decide the fate for whole directory
t1011: fix sparse-checkout initialization and add new file
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions