]> ruderich.org/simon Gitweb - config/dotfiles.git/commitdiff
vcs: t: adapt to diff.mnemonicprefix = true
authorSimon Ruderich <simon@ruderich.org>
Sun, 15 Jul 2018 08:16:50 +0000 (10:16 +0200)
committerSimon Ruderich <simon@ruderich.org>
Sun, 15 Jul 2018 08:16:50 +0000 (10:16 +0200)
Broken since b179b88 ("gitconfig: enable diff.mnemonicprefix",
2016-11-06).

vcs/t/expected-empty.txt
vcs/t/expected-nonspaces.txt
vcs/t/expected-word-nonword.txt
vcs/t/expected-words-nonword.txt
vcs/t/expected-words-nonwords-spaces.txt
vcs/t/expected-words-nonwords.txt
vcs/t/expected-words-nonwordspaces-spaces.txt
vcs/t/expected-words-nonwordspaces.txt

index 19c91bfe4393be7ab6eaa7be833b2f79e9ce0779..dfe6a3185fe8cfe7b0316a7aa6087b0b06bdaf1d 100644 (file)
@@ -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
 ====
index d6b35588abded05df5a9d0f775341ab334228d00..f2a22bfbf246c404569167591a19f910fbf36c34 100644 (file)
@@ -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
 [-=====-]{+====+}
index 76b34ac01fee9af0dd24c51e6e353f54b7008f37..456e29c3d7d50ae142e24a27c2b9dc9ac6b21587 100644 (file)
@@ -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
 ====[-=-]
index 5e0f6b1afda1322b2d070ef987b8ca9430b1dd99..00aaa3c732ef3435f3f513a63e759ec72c80fe3a 100644 (file)
@@ -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
 ====[-=-]
index cbc70dc339eff37d23264cb71efe5c6d66ce6b06..dc49204c019dd1c79d7775c4de3cfceb95550d9d 100644 (file)
@@ -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
 [-=====-]{+====+}
index cbc70dc339eff37d23264cb71efe5c6d66ce6b06..dc49204c019dd1c79d7775c4de3cfceb95550d9d 100644 (file)
@@ -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
 [-=====-]{+====+}
index 11769daccba963feb41b96c8029228a0de9c1866..5115559af9c1f424b09a31272a0c33d9e1f0f323 100644 (file)
@@ -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
 [-=====-]{+====+}
index ce5d927afd53fbdaa16ebbddc89de61f38faa63f..b0cc2f409d34778a864faf2cff5272453ed585b2 100644 (file)
@@ -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
 [-=====-]{+====+}