summaryrefslogtreecommitdiff
path: root/git-gui
diff options
context:
space:
mode:
authorLibravatar Christian Couder <chriscool@tuxfamily.org>2010-03-31 21:22:05 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-04-01 11:14:10 -0700
commitae8c79fd8fe47bfebf56ae83461cbedb934cff92 (patch)
tree4ee63a3f0e539250c8398d9389ffce508dfa1569 /git-gui
parentrevert: use strbuf to refactor the code that writes the merge message (diff)
downloadtgif-ae8c79fd8fe47bfebf56ae83461cbedb934cff92.tar.xz
revert: refactor merge recursive code into its own function
The code that is used to do a recursive merge is extracted from the revert_or_cherry_pick() function and put into a new do_recursive_merge() function. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui')
0 files changed, 0 insertions, 0 deletions