ref: 06cdd2915b5b8c46cebbc2c2bc3e5684027abc79
parent: d58ba675e7a5434d918502c389f832afdece4cc0
author: Ori Bernstein <ori@eigenstate.org>
date: Mon Nov 18 15:23:54 EST 2024
git/merge: normal messages go to stdout
--- a/sys/src/cmd/git/merge
+++ b/sys/src/cmd/git/merge
@@ -42,5 +42,5 @@
echo $theirs >> .git/merge-parents
merge $ours $base $theirs
->[1=2] echo 'merge complete: remember to commit'
+echo 'merge complete: remember to commit'
exit ''
--
⑨