diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-02-15 12:54:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-15 12:54:19 -0800 |
| commit | cbf1860d73b782e7924e63361df485b31225a26a (patch) | |
| tree | a86ce71a399fb8153be1552f08e51c58b2c5b5cf /merge-recursive.c | |
| parent | 2f4e87d7777a0bcffa8a7cc3cc52e1e8b2c352ff (diff) | |
| parent | 9e2edd66dda418dad751d5eb2e5921e05e57cd30 (diff) | |
Merge branch 'rs/swap'
Code clean-up.
* rs/swap:
graph: use SWAP macro
diff: use SWAP macro
use SWAP macro
apply: use SWAP macro
add SWAP macro
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index d327209443..b7ff1ada3c 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1390,14 +1390,11 @@ static int process_renames(struct merge_options *o, branch1 = o->branch1; branch2 = o->branch2; } else { - struct rename *tmp; renames1 = b_renames; renames2Dst = &a_by_dst; branch1 = o->branch2; branch2 = o->branch1; - tmp = ren2; - ren2 = ren1; - ren1 = tmp; + SWAP(ren2, ren1); } if (ren1->processed) |