diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-11-17 15:00:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-17 15:00:46 -0800 |
| commit | 4739c19d7f905b326375083e60866e8977251ba3 (patch) | |
| tree | d7666d7f98bc924a1de9fec7be335f9516383eb1 /builtin/merge-ours.c | |
| parent | Merge branch 'kb/completion-checkout' (diff) | |
| parent | test: allow running the tests under "prove" (diff) | |
| download | tgif-4739c19d7f905b326375083e60866e8977251ba3.tar.xz | |
Merge branch 'mg/make-prove'
* mg/make-prove:
test: allow running the tests under "prove"
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions