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/merge: normal messages go to stdout

Browse source
This commit is contained in:
Ori Bernstein 2024-11-18 20:23:54 +00:00
parent d58ba675e7
commit 06cdd2915b
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/src/cmd/git/merge
View file

@ -42,5 +42,5 @@ echo $ours >> .git/merge-parents
echo $theirs >> .git/merge-parents
merge $ours $base $theirs
>[1=2] echo 'merge complete: remember to commit'
echo 'merge complete: remember to commit'
exit ''