aboutsummaryrefslogtreecommitdiff
path: root/setup.c
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2008-09-03 02:30:03 +0200
committerJunio C Hamano <gitster@pobox.com>2008-09-04 22:50:43 -0700
commitc7d849243a4be2c60ff48cc42ea8b0518bb7f27f (patch)
tree49a8aa4deb18ccbfc50833bc2e02239d2810cd48 /setup.c
parentb7fa51da9be3cee9e2ca31af4edfec18b8ecbce7 (diff)
downloadgit-c7d849243a4be2c60ff48cc42ea8b0518bb7f27f.tar.gz
git-c7d849243a4be2c60ff48cc42ea8b0518bb7f27f.tar.xz
merge-recursive: move the global obuf to struct merge_options
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Diffstat (limited to 'setup.c')
0 files changed, 0 insertions, 0 deletions