ref: 8819d2f80a352d7f7d8784023edc385d63677713
parent: 054269d06554cee4e8dbca438d005f4d50116832
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 ''
--
⑨