mirror of
https://git.freebsd.org/ports.git
synced 2025-06-18 19:20:36 -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
20 lines
514 B
Bash
20 lines
514 B
Bash
--- regress/cmdline/histedit.sh.orig 2021-03-22 10:05:11 UTC
|
|
+++ regress/cmdline/histedit.sh
|
|
@@ -1507,7 +1507,7 @@ test_histedit_fold_only() {
|
|
|
|
cat > $testroot/editor.sh <<EOF
|
|
#!/bin/sh
|
|
-sed -i 's/.*/committing folded changes/' "\$1"
|
|
+sed -i '' 's/.*/committing folded changes/' "\$1"
|
|
EOF
|
|
chmod +x $testroot/editor.sh
|
|
|
|
@@ -1623,7 +1623,7 @@ test_histedit_fold_only_empty_logmsg() {
|
|
|
|
cat > $testroot/editor.sh <<EOF
|
|
#!/bin/sh
|
|
-sed -i 'd' "\$1"
|
|
+sed -i '' 'd' "\$1"
|
|
EOF
|
|
chmod +x $testroot/editor.sh
|
|
|