summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorLibravatar Christian Couder <chriscool@tuxfamily.org>2010-03-31 21:22:04 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-04-01 11:14:09 -0700
commitbc84a7fbac4ce85bb93eeb57b5cb39548d286ad0 (patch)
treef50ea95e4025883bc455c63ec583a2162b8073e0 /builtin.h
parentmerge-recursive: add a label for ancestor (diff)
downloadtgif-bc84a7fbac4ce85bb93eeb57b5cb39548d286ad0.tar.xz
revert: use strbuf to refactor the code that writes the merge message
The code in this commit was written by Stephan Beyer for the sequencer GSoC project: git://repo.or.cz/git/sbeyer.git Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin.h')
0 files changed, 0 insertions, 0 deletions