]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e3de888) | patch
merge-recursive: rename locals 'o' and 'a' to 'obuf' and 'abuf'
authorElijah Newren <newren@gmail.com>
Fri, 5 Apr 2019 15:00:15 +0000 (08:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Apr 2019 07:02:07 +0000 (16:02 +0900)
commit93a02c5553a293aa0ae34293304332dbc0fee431
tree247b66b5b0576472b1e0406bde1ea3416d66a310tree | snapshot
parente3de888ca052f7962c1a2e2f83b4640c40847ab2commit | 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>
merge-recursive.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.