merge-recursive: rename diff_filespec 'one' to 'o'
authorElijah Newren <newren@gmail.com>
Fri, 5 Apr 2019 15:00:14 +0000 (08:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Apr 2019 07:02:07 +0000 (16:02 +0900)
commite3de888...a052f7962c1a2e2f83b4640c40847ab2
tree12a57f9...7e02ffb50530980a510a785d1fbd73f0copy hash to clipboard (tree)
parent259ccb6...c324912ea18b151d9c236ac17610c2f5copy hash to clipboard (diff)
merge-recursive.c