summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
diff options
context:
space:
mode:
authorLibravatar Thomas Rast <trast@student.ethz.ch>2012-02-23 10:42:23 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-23 13:53:27 -0800
commit8a557bb77fc009b00f7952f0d3d6ebd33079f70e (patch)
treee2e2fd250009b3067baeb73d92910b7de43306f6 /builtin/merge-index.c
parentstrbuf: improve strbuf_get*line documentation (diff)
downloadtgif-8a557bb77fc009b00f7952f0d3d6ebd33079f70e.tar.xz
t5704: match tests to modern style
The test did not adhere to the current style on several counts: . empty lines around the test blocks, but within the test string . ': > file' or even just '> file' with an extra space . inconsistent indentation . hand-rolled commits instead of using test_commit Fix all of them. There's a catch to the last point: test_commit creates a tag, which the original test did not create. We still change it to test_commit, and explicitly delete the tags, so as to highlight that the test relies on not having them. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions