From 92becca71de68221f9ae798f8b019c046387a8e1 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Sun, 15 Jul 2018 10:16:50 +0200 Subject: [PATCH] vcs: t: adapt to diff.mnemonicprefix = true Broken since b179b88 ("gitconfig: enable diff.mnemonicprefix", 2016-11-06). --- vcs/t/expected-empty.txt | 6 +++--- vcs/t/expected-nonspaces.txt | 6 +++--- vcs/t/expected-word-nonword.txt | 6 +++--- vcs/t/expected-words-nonword.txt | 6 +++--- vcs/t/expected-words-nonwords-spaces.txt | 6 +++--- vcs/t/expected-words-nonwords.txt | 6 +++--- vcs/t/expected-words-nonwordspaces-spaces.txt | 6 +++--- vcs/t/expected-words-nonwordspaces.txt | 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/vcs/t/expected-empty.txt b/vcs/t/expected-empty.txt index 19c91bf..dfe6a31 100644 --- a/vcs/t/expected-empty.txt +++ b/vcs/t/expected-empty.txt @@ -1,6 +1,6 @@ -diff --git a/test.txt b/test.txt ---- a/test.txt -+++ b/test.txt +diff --git i/test.txt w/test.txt +--- i/test.txt ++++ w/test.txt @@ -1,26 +1,27 @@ Tests ==== diff --git a/vcs/t/expected-nonspaces.txt b/vcs/t/expected-nonspaces.txt index d6b3558..f2a22bf 100644 --- a/vcs/t/expected-nonspaces.txt +++ b/vcs/t/expected-nonspaces.txt @@ -1,6 +1,6 @@ -diff --git a/test.txt b/test.txt ---- a/test.txt -+++ b/test.txt +diff --git i/test.txt w/test.txt +--- i/test.txt ++++ w/test.txt @@ -1,26 +1,27 @@ Tests [-=====-]{+====+} diff --git a/vcs/t/expected-word-nonword.txt b/vcs/t/expected-word-nonword.txt index 76b34ac..456e29c 100644 --- a/vcs/t/expected-word-nonword.txt +++ b/vcs/t/expected-word-nonword.txt @@ -1,6 +1,6 @@ -diff --git a/test.txt b/test.txt ---- a/test.txt -+++ b/test.txt +diff --git i/test.txt w/test.txt +--- i/test.txt ++++ w/test.txt @@ -1,26 +1,27 @@ Tests ====[-=-] diff --git a/vcs/t/expected-words-nonword.txt b/vcs/t/expected-words-nonword.txt index 5e0f6b1..00aaa3c 100644 --- a/vcs/t/expected-words-nonword.txt +++ b/vcs/t/expected-words-nonword.txt @@ -1,6 +1,6 @@ -diff --git a/test.txt b/test.txt ---- a/test.txt -+++ b/test.txt +diff --git i/test.txt w/test.txt +--- i/test.txt ++++ w/test.txt @@ -1,26 +1,27 @@ Tests ====[-=-] diff --git a/vcs/t/expected-words-nonwords-spaces.txt b/vcs/t/expected-words-nonwords-spaces.txt index cbc70dc..dc49204 100644 --- a/vcs/t/expected-words-nonwords-spaces.txt +++ b/vcs/t/expected-words-nonwords-spaces.txt @@ -1,6 +1,6 @@ -diff --git a/test.txt b/test.txt ---- a/test.txt -+++ b/test.txt +diff --git i/test.txt w/test.txt +--- i/test.txt ++++ w/test.txt @@ -1,26 +1,27 @@ Tests [-=====-]{+====+} diff --git a/vcs/t/expected-words-nonwords.txt b/vcs/t/expected-words-nonwords.txt index cbc70dc..dc49204 100644 --- a/vcs/t/expected-words-nonwords.txt +++ b/vcs/t/expected-words-nonwords.txt @@ -1,6 +1,6 @@ -diff --git a/test.txt b/test.txt ---- a/test.txt -+++ b/test.txt +diff --git i/test.txt w/test.txt +--- i/test.txt ++++ w/test.txt @@ -1,26 +1,27 @@ Tests [-=====-]{+====+} diff --git a/vcs/t/expected-words-nonwordspaces-spaces.txt b/vcs/t/expected-words-nonwordspaces-spaces.txt index 11769da..5115559 100644 --- a/vcs/t/expected-words-nonwordspaces-spaces.txt +++ b/vcs/t/expected-words-nonwordspaces-spaces.txt @@ -1,6 +1,6 @@ -diff --git a/test.txt b/test.txt ---- a/test.txt -+++ b/test.txt +diff --git i/test.txt w/test.txt +--- i/test.txt ++++ w/test.txt @@ -1,26 +1,27 @@ Tests [-=====-]{+====+} diff --git a/vcs/t/expected-words-nonwordspaces.txt b/vcs/t/expected-words-nonwordspaces.txt index ce5d927..b0cc2f4 100644 --- a/vcs/t/expected-words-nonwordspaces.txt +++ b/vcs/t/expected-words-nonwordspaces.txt @@ -1,6 +1,6 @@ -diff --git a/test.txt b/test.txt ---- a/test.txt -+++ b/test.txt +diff --git i/test.txt w/test.txt +--- i/test.txt ++++ w/test.txt @@ -1,26 +1,27 @@ Tests [-=====-]{+====+} -- 2.43.2