diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-04-23 12:43:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-23 12:43:10 -0700 |
| commit | b6195198fec3746b04863d81d163c16575a249bf (patch) | |
| tree | 26539da9fb41fe6dcc09e33d1fb838b49b7494b0 /builtin/merge.c | |
| parent | Merge branch 'jn/debian-customizes-default-editor' (diff) | |
| parent | tests: modernise style: more uses of test_line_count (diff) | |
| download | tgif-b6195198fec3746b04863d81d163c16575a249bf.tar.xz | |
Merge branch 'sl/test-wc-l-line-count'
By Stefano Lattarini
* sl/test-wc-l-line-count:
tests: modernise style: more uses of test_line_count
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions