diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-11 11:14:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-11 11:14:57 -0700 |
| commit | 538847cd4c6a7398e8799a829d731be75f09152f (patch) | |
| tree | f46d9761a59abc3cc6624c74d689f6ebfe28b164 /builtin/merge-recursive.c | |
| parent | Merge branch 'rl/show-empty-prefix' into maint (diff) | |
| parent | tests: modernise style: more uses of test_line_count (diff) | |
| download | tgif-538847cd4c6a7398e8799a829d731be75f09152f.tar.xz | |
Merge branch 'sl/test-wc-l-line-count' into maint
By Stefano Lattarini
* sl/test-wc-l-line-count:
tests: modernise style: more uses of test_line_count
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions