git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 79a3efd)
builtin/apply: move 'threeway' global into 'struct apply_state'
authorChristian Couder <redacted>
Tue, 24 May 2016 08:10:59 +0000 (10:10 +0200)
committerJunio C Hamano <redacted>
Wed, 1 Jun 2016 17:10:16 +0000 (10:10 -0700)
commitb12e888f7a9489b964ad266b27d7fcfa62fa78e4
tree02a7744b75c17ab503ee8852b4dfd7411a40cb73tree | snapshot
parent79a3efda795a88403cea3e9ff321b4b668f393d9commit | diff
builtin/apply: move 'threeway' global into 'struct apply_state'

To libify the apply functionality the 'threeway' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <redacted>
Signed-off-by: Christian Couder <redacted>
Signed-off-by: Junio C Hamano <redacted>
builtin/apply.c diff | blob | history
git clone https://git.99rst.org/PROJECT