From 7faed22010cacb9bd7cc029b860840947e03bf8a Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 18 Feb 2018 11:32:21 +0000
Subject: git-debrebase: Introduce term `anchor'

And replace `breakwater merge' and `breakwater upstream merge'
everywhere.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 tests/lib-gdr | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests/lib-gdr')

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
-- 
cgit v1.2.3