ref: a5282f9eab1b78bd65e5144c81bf0f19b3f9efaf
parent: 5d06e7ad66f2dad04f25948bcdc256f812c47590
author: Ori Bernstein <ori@eigenstate.org>
date: Sat Jun 5 13:42:05 EDT 2021
git/{branch,pull}: merge files correctly
merge1 would clobber the global '$base' variable,
which is not what we wanted. Run it in a subshell
with its own env.