mirror of
https://git.freebsd.org/ports.git
synced 2025-06-19 11:40:31 -04:00
efd08bde22
User-visible changes: - use Myers diff instead of Patience diff when merging files with diff3 - improve got log -x documentation - improve got ref -d documentation - ensure that old commits remain referenced after rebase and histedit - new got rebase -l option which lists past rebase operations - new got histedit -l option which lists past histedit operations
11 lines
285 B
Bash
11 lines
285 B
Bash
--- regress/cmdline/commit.sh.orig 2021-03-22 15:59:28 UTC
|
|
+++ regress/cmdline/commit.sh
|
|
@@ -1376,7 +1376,7 @@ test_commit_prepared_logmsg() {
|
|
|
|
cat > $testroot/editor.sh <<EOF
|
|
#!/bin/sh
|
|
-sed -i 's/foo/bar/' "\$1"
|
|
+sed -i '' 's/foo/bar/' "\$1"
|
|
EOF
|
|
chmod +x $testroot/editor.sh
|
|
|