diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-02-10 15:32:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-10 15:32:26 -0800 |
| commit | 9b27ea95189b1f276c9f7e10df81fa1476a4ad4d (patch) | |
| tree | 8116ae20f73dc9596be6be72628012b699680056 /builtin-merge-ours.c | |
| parent | gitweb: add $prevent_xss option to prevent XSS by repository content (diff) | |
| parent | Clear the delta base cache during fast-import checkpoint (diff) | |
| download | tgif-9b27ea95189b1f276c9f7e10df81fa1476a4ad4d.tar.xz | |
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0:
Clear the delta base cache during fast-import checkpoint
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions