diff options
| author | Mattias Andrée <m@maandree.se> | 2026-09-24 23:19:13 +0200 |
|---|---|---|
| committer | Mattias Andrée <m@maandree.se> | 2026-09-24 23:19:13 +0200 |
| commit | 9b98f1a9222e5e96949bf74538a97900f2d847b1 (patch) | |
| tree | 468ab35cb2ac75ef1c48d76189520ee9bad23495 /t/common.sh | |
| parent | Add conflcit resultions strategies and interactive mode, and a lot of tests (diff) | |
| download | git-rediff-9b98f1a9222e5e96949bf74538a97900f2d847b1.tar.gz git-rediff-9b98f1a9222e5e96949bf74538a97900f2d847b1.tar.bz2 git-rediff-9b98f1a9222e5e96949bf74538a97900f2d847b1.tar.xz | |
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to 't/common.sh')
| -rw-r--r-- | t/common.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/common.sh b/t/common.sh index 30e4b6e..38d2845 100644 --- a/t/common.sh +++ b/t/common.sh @@ -141,7 +141,7 @@ interactive_filename () { interactive_prompt () { test $# = 2 - printf '\e[1;34m(%s/%s) Resolve this conflict [h,t,b,m,r,e,s,d,q,?]? \e[0m\n' "$1" "$2" + printf '\e[1;34m(%s/%s) Resolve this conflict [h,t,b,m,y,r,e,s,d,q,?]? \e[0m\n' "$1" "$2" } interactive_help () { @@ -155,6 +155,7 @@ interactive_help () { fi printf '%s\n' \ 'm - merge' \ + 'y - select symmetric branches' \ 'r - reduce' \ 'e - manually edit this hunk' \ 's - skip this hunk' \ |