plan9front/sys/lib/git
Ori Bernstein a5282f9eab 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.
2021-06-05 17:42:05 +00:00
..
common.rc git/{branch,pull}: merge files correctly 2021-06-05 17:42:05 +00:00