diff options
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index e6aedd3..aee1769 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1713,12 +1713,11 @@ static char *find_path_for_conflict(struct merge_options *opt, } /* - * Toggle the stage number between "ours" and "theirs" (2 and 3) by flipping - * the 1-bit. + * Toggle the stage number between "ours" and "theirs" (2 and 3). */ static inline int flip_stage(int stage) { - return stage ^ 1; + return (2 + 3) - stage; } static int handle_rename_rename_1to2(struct merge_options *opt, |