mirror of
https://git.freebsd.org/ports.git
synced 2025-06-24 06:00:30 -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
23 lines
368 B
Bash
23 lines
368 B
Bash
--- regress/cmdline/common.sh.orig 2021-03-22 10:05:11 UTC
|
|
+++ regress/cmdline/common.sh
|
|
@@ -26,6 +26,20 @@ export GOT_TEST_ROOT="/tmp"
|
|
|
|
export MALLOC_OPTIONS=S
|
|
|
|
+# compat wrapper
|
|
+sed()
|
|
+(
|
|
+ for i; do
|
|
+ arg=$1
|
|
+ shift
|
|
+ case $arg in
|
|
+ -i) set - "$@" "$arg" '' ;;
|
|
+ *) set - "$@" "$arg" ;;
|
|
+ esac
|
|
+ done
|
|
+ exec sed "$@"
|
|
+)
|
|
+
|
|
git_init()
|
|
{
|
|
git init -q "$1"
|