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/reduce-short-option | |
| parent | Add conflcit resultions strategies and interactive mode, and a lot of tests (diff) | |
| download | git-rediff-1.2.tar.gz git-rediff-1.2.tar.bz2 git-rediff-1.2.tar.xz | |
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to 't/reduce-short-option')
| -rwxr-xr-x | t/reduce-short-option | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/t/reduce-short-option b/t/reduce-short-option new file mode 100755 index 0000000..0e2b5b7 --- /dev/null +++ b/t/reduce-short-option @@ -0,0 +1,26 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} 1" \ + common-first \ + head-second \ + common-third \ + "${TAIL} 2" \ + common-first \ + tail-second \ + common-third \ + "${END} 2" + +printf '%s\n' > file.expected \ + common-first \ + "${HEAD} 1" \ + head-second \ + "${TAIL} 2" \ + tail-second \ + "${END} 2" \ + common-third + +conflict -r file + +also_interactive r |