summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Michael Haggerty <mhagger@alum.mit.edu>2011-08-04 06:36:21 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-04 15:53:17 -0700
commitcd93bffb91630d8c695e1ac59239aa75cc2ebf92 (patch)
tree903f5bb0f314ef09db82de622fbca64e75f57a63 /git-merge-octopus.sh
parentExtract a function collect_all_attrs() (diff)
downloadtgif-cd93bffb91630d8c695e1ac59239aa75cc2ebf92.tar.xz
Remove redundant call to bootstrap_attr_stack()
prepare_attr_stack() does the same thing. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions