From 706aad3d94ee4d9ff93c8c21398f0bb471a438da Mon Sep 17 00:00:00 2001 From: glenda Date: Sat, 5 Jun 2021 18:50:20 +0000 Subject: git/branch: merge correct set of files we were switching branches before we got the full list of modified files, which could garble what we were trying to merge. --- sys/lib/git/common.rc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'sys/lib/git') diff --git a/sys/lib/git/common.rc b/sys/lib/git/common.rc index edb95f7d1..b98987d75 100644 --- a/sys/lib/git/common.rc +++ b/sys/lib/git/common.rc @@ -44,9 +44,9 @@ fn merge1 {@{ rfork e n=$pid out=$1 - theirs=$2 + ours=$2 base=$3 - ours=$4 + theirs=$4 tmp=$out.tmp while(test -f $tmp){ tmp=$tmp.$n @@ -70,8 +70,7 @@ fn merge1 {@{ rm -f $tmp $out git/rm $out } - } -} +}} fn gitup{ gitroot=`{git/conf -r >[2]/dev/null} -- cgit v1.2.3