builtin/apply: move 'threeway' global into 'struct apply_state'
authorChristian Couder <christian.couder@gmail.com>
Tue, 24 May 2016 08:10:59 +0000 (10:10 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 1 Jun 2016 17:10:16 +0000 (10:10 -0700)
commitb12e888...7a9489b964ad266b27d7fcfa62fa78e4
tree02a7744...75c17ab503ee8852b4dfd7411a40cb73copy hash to clipboard (tree)
parent79a3efd...795a88403cea3e9ff321b4b668f393d9copy hash to clipboard (diff)
builtin/apply.c