diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-18 11:32:21 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:06:58 +0100 |
| commit | 7faed22010cacb9bd7cc029b860840947e03bf8a (patch) | |
| tree | ce6da313692a8b4cbc3718976fa477ff2cf2193c /tests | |
| parent | 4f22209a590da904276c3a52643473f44cc22d18 (diff) | |
git-debrebase: Introduce term `anchor'
And replace `breakwater merge' and `breakwater upstream merge'
everywhere.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib-gdr | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/lib-gdr b/tests/lib-gdr index de365a2..565e0b1 100644 --- a/tests/lib-gdr +++ b/tests/lib-gdr @@ -55,8 +55,8 @@ t-gdr-good () { Changelog/Packaging) ;; Changelog/Upstream) ;; Upstream/SAME) ;; - BreakwaterUpstreamMerge/Upstream) ;; - BreakwaterUpstreamMerge/Packaging) ;; + Anchor/Upstream) ;; + Anchor/Packaging) ;; *) fail "etype=$etype ctype=$ctype cetype=$cetype $cid" ;; @@ -98,7 +98,7 @@ t-gdr-good () { Upstream/SAME) git diff --quiet $expect..$cid -- ':debian' ;; - BreakwaterUpstreamMerge) + Anchor) break ;; esac |