summaryrefslogtreecommitdiff
path: root/builtin-merge.c
diff options
context:
space:
mode:
authorLibravatar Anand Kumria <wildfire@progsoc.org>2008-08-14 23:40:39 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-08-14 18:14:24 -0700
commita7d3ef9d099ab00a19595bc3ca8abdc1fc6ff35d (patch)
tree1975ee8782ee13305f55c8927e490a6bb5e94c44 /builtin-merge.c
parentAdd p4 read_pipe and write_pipe wrappers (diff)
downloadtgif-a7d3ef9d099ab00a19595bc3ca8abdc1fc6ff35d.tar.xz
Utilise our new p4_read_pipe and p4_write_pipe wrappers
Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions