summaryrefslogtreecommitdiff
path: root/merge-file.h
diff options
context:
space:
mode:
authorLibravatar Thomas Rast <trast@student.ethz.ch>2012-02-17 11:25:08 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-17 08:11:29 -0800
commit12a29b1a50d47594eb3a29003e3f1eb540580aaa (patch)
tree40618d4460800764f77d43ded289a53cddab14d0 /merge-file.h
parentMerge branch 'jk/git-dir-lookup' (diff)
downloadtgif-12a29b1a50d47594eb3a29003e3f1eb540580aaa.tar.xz
Move the user-facing test library to test-lib-functions.sh
This just moves all the user-facing functions to a separate file and sources that instead. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.h')
0 files changed, 0 insertions, 0 deletions