diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-06-28 12:53:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-28 12:53:33 -0700 |
| commit | 18404434bf406f6a6f892ed73320c5cf9cc187dd (patch) | |
| tree | 52ff19a64024f2c6bed5b308adf2ca97daca9ed6 /builtin/merge-ours.c | |
| parent | Merge branch 'nd/completion-negation' (diff) | |
| parent | tests: clean after SANITY tests (diff) | |
| download | tgif-18404434bf406f6a6f892ed73320c5cf9cc187dd.tar.xz | |
Merge branch 'jc/clean-after-sanity-tests'
test cleanup.
* jc/clean-after-sanity-tests:
tests: clean after SANITY tests
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions