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)
commit93a02c5...53a293aa0ae34293304332dbc0fee431
tree247b66b...b0576472b1e0406bde1ea3416d66a310copy hash to clipboard (tree)
parente3de888...a052f7962c1a2e2f83b4640c40847ab2copy hash to clipboard (diff)
merge-recursive.c