summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-01-25 18:57:45 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-01-27 11:17:41 -0800
commit4c616c2ba1c176573bd1ae7c4ec3271d1f175448 (patch)
treeb5c6c4ef5f8a8eef6518a0623ef498be9551e3eb /Documentation
parentmerge-recursive: silence -Wxor-used-as-pow warning (diff)
downloadtgif-4c616c2ba1c176573bd1ae7c4ec3271d1f175448.tar.xz
merge-recursive: use subtraction to flip stage
The flip_stage() helper uses a bit-flipping xor to switch between "2" and "3". While clever, this relies on a property of those two numbers that is mostly coincidence. Let's write it as a subtraction; that's more clear and would extend to other numbers if somebody copies the logic. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions