diff options
| author | Elijah Newren <newren@gmail.com> | 2019-04-05 08:00:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-08 16:02:07 +0900 |
| commit | 93a02c5553a293aa0ae34293304332dbc0fee431 (patch) | |
| tree | 247b66b5b0576472b1e0406bde1ea3416d66a310 /commit.c | |
| parent | e3de888ca052f7962c1a2e2f83b4640c40847ab2 (diff) | |
merge-recursive: rename locals 'o' and 'a' to 'obuf' and 'abuf'
Since we want to replace oid,mode pairs with a single diff_filespec,
we will soon want to be able to use the names 'o', 'a', and 'b' for
the three different file versions. Rename some local variables in
blob_unchanged() that would otherwise conflict.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions