Merge branch 'vm/octopus-merge-bases-simplify'
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Jan 2014 18:33:45 +0000 (10:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Jan 2014 18:33:45 +0000 (10:33 -0800)
* vm/octopus-merge-bases-simplify:
get_octopus_merge_bases(): cleanup redundant variable

1  2 
commit.c
diff --cc commit.c
Simple merge