diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-20 13:24:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-20 13:24:08 -0800 |
| commit | 1b048b197d6c183b69ad0914da127321c1e6b6a6 (patch) | |
| tree | de56d4018232789d79a2b07e779f728ce34a2c2a /xdiff/xprepare.c | |
| parent | Merge branch 'tr/cache-tree' (diff) | |
| parent | t/t2023-checkout-m.sh: fix use of test_must_fail (diff) | |
| download | tgif-1b048b197d6c183b69ad0914da127321c1e6b6a6.tar.xz | |
Merge branch 'jc/checkout-m-twoway'
* jc/checkout-m-twoway:
t/t2023-checkout-m.sh: fix use of test_must_fail
Diffstat (limited to 'xdiff/xprepare.c')
0 files changed, 0 insertions, 0 deletions