diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-01-26 02:57:45 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-01-27 22:17:41 +0300 |
| commit | 4c616c2ba1c176573bd1ae7c4ec3271d1f175448 (patch) | |
| tree | b5c6c4ef5f8a8eef6518a0623ef498be9551e3eb /xdiff-interface.c | |
| parent | ee798742bd35d88770e4ef05a7944b5783790e60 (diff) | |
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 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions