cirno/plan9front
1
0
Fork 0
mirror of git://git.9front.org/plan9front/plan9front synced 2025-01-12 11:10:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

git/branch: stop emitting incorrect 'merge failed' messages

Browse source
This commit is contained in:
Ori Bernstein 2024-12-14 05:32:05 +00:00
parent 473ebd0f9e
commit 2f685dd96b
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sys/src/cmd/git/branch
View file

@ -114,8 +114,9 @@ for(m in $cleanpaths){
for(ours in $dirtypaths){
common=$gitfs/object/$orig/tree/$ours
theirs=$gitfs/object/$base/tree/$ours
merge1 $ours $ours $common $theirs || st=$status
if(! ~ $#st 1)
merge1 $ours $ours $common $theirs
st=$status
if(! ~ $st '')
>[1=2] echo merge failed $ours: $st
}
if(~ $new */*)