diff options
| author | Mattias Andrée <m@maandree.se> | 2026-09-22 19:53:29 +0200 |
|---|---|---|
| committer | Mattias Andrée <m@maandree.se> | 2026-09-22 19:53:29 +0200 |
| commit | d8de1b23e8ec896759424a2f146969783cdd89e3 (patch) | |
| tree | ed1ea3e97add5116230fd2df34e42b829a70ab39 /t/mixed-marker-sizes | |
| parent | fix doc text (diff) | |
| download | git-rediff-1.1.tar.gz git-rediff-1.1.tar.bz2 git-rediff-1.1.tar.xz | |
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to '')
| -rwxr-xr-x | t/mixed-marker-sizes | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/t/mixed-marker-sizes b/t/mixed-marker-sizes new file mode 100755 index 0000000..8cd186b --- /dev/null +++ b/t/mixed-marker-sizes @@ -0,0 +1,30 @@ +#!/bin/sh -e +. t/common.sh + +set_conflict_marker_size 3 small + +printf '%s\n' > small \ + "${HEAD} small-head" \ + shared \ + "${TAIL}" \ + shared \ + "${END} small-tail" + +printf '%s\n' > small.expected \ + shared + +set_conflict_marker_size 10 large + +printf '%s\n' > large \ + "${HEAD} large-head" \ + shared \ + "${TAIL}" \ + shared \ + "${END} large-tail" + +printf '%s\n' > large.expected \ + shared + +normal small large + +also_interactive rr |