From: Pavel Roskin <proski@xxxxxxx> Merge labels keep changing, and they are not required to identify specific lines uniquely for the test purposes. Signed-off-by: Pavel Roskin <proski@xxxxxxx> --- .../tutorial-script/0010-alice-bob-fixup.ed | 2 +- .../tutorial-script/0017-alice-bob-fixup.ed | 4 ++-- .../tutorial-script/0018-alice-charlie-fixup1.ed | 4 ++-- .../tutorial-script/0019-alice-charlie-fixup2.ed | 4 ++-- .../tutorial-script/0021-bob-alice-fixup1.ed | 4 ++-- .../tutorial-script/0022-bob-alice-fixup2.ed | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Documentation/tutorial-script/0010-alice-bob-fixup.ed b/Documentation/tutorial-script/0010-alice-bob-fixup.ed index 81b1360..35ba0c3 100644 --- a/Documentation/tutorial-script/0010-alice-bob-fixup.ed +++ b/Documentation/tutorial-script/0010-alice-bob-fixup.ed @@ -1,3 +1,3 @@ -/^<<<<<<< bob/,/^>>>>>>> bobswork/d +/^<<<<<<< /,/^>>>>>>> /d w q diff --git a/Documentation/tutorial-script/0017-alice-bob-fixup.ed b/Documentation/tutorial-script/0017-alice-bob-fixup.ed index ad04eb7..00626e3 100644 --- a/Documentation/tutorial-script/0017-alice-bob-fixup.ed +++ b/Documentation/tutorial-script/0017-alice-bob-fixup.ed @@ -1,5 +1,5 @@ -/^<<<<<<< Makefile/d +/^<<<<<<< /d /^=======/,/^=======/+1d -/^>>>>>>> \.merge_file_/d +/^>>>>>>> /d w q diff --git a/Documentation/tutorial-script/0018-alice-charlie-fixup1.ed b/Documentation/tutorial-script/0018-alice-charlie-fixup1.ed index 9682b4a..f73223c 100644 --- a/Documentation/tutorial-script/0018-alice-charlie-fixup1.ed +++ b/Documentation/tutorial-script/0018-alice-charlie-fixup1.ed @@ -1,7 +1,7 @@ -/^<<<<<<< master/d +/^<<<<<<< /d /^rpn\.o:/s/\.h.*$/.h lexer.h/ /^lexer\.o:/s/:.*$/: lexer.h/ -/^=======/,/^>>>>>>> charlie/d +/^=======/,/^>>>>>>> /d w q diff --git a/Documentation/tutorial-script/0019-alice-charlie-fixup2.ed b/Documentation/tutorial-script/0019-alice-charlie-fixup2.ed index 5d531de..75832f1 100644 --- a/Documentation/tutorial-script/0019-alice-charlie-fixup2.ed +++ b/Documentation/tutorial-script/0019-alice-charlie-fixup2.ed @@ -1,5 +1,5 @@ -/^<<<<<<< master/,/^=======/d -/^>>>>>>> charlie/d +/^<<<<<<< /,/^=======/d +/^>>>>>>> /d w q diff --git a/Documentation/tutorial-script/0021-bob-alice-fixup1.ed b/Documentation/tutorial-script/0021-bob-alice-fixup1.ed index df703d5..9950144 100644 --- a/Documentation/tutorial-script/0021-bob-alice-fixup1.ed +++ b/Documentation/tutorial-script/0021-bob-alice-fixup1.ed @@ -1,4 +1,4 @@ -/^<<<<<<< master/,/^=======/d -/^>>>>>>> origin/d +/^<<<<<<< /,/^=======/d +/^>>>>>>> /d w q diff --git a/Documentation/tutorial-script/0022-bob-alice-fixup2.ed b/Documentation/tutorial-script/0022-bob-alice-fixup2.ed index d8c5746..df1c077 100644 --- a/Documentation/tutorial-script/0022-bob-alice-fixup2.ed +++ b/Documentation/tutorial-script/0022-bob-alice-fixup2.ed @@ -1,5 +1,5 @@ /^#include "stack\.h"/+1d /^#include "lexer\.h"/+1,/^#include "stack\.h"/d -/^<<<<<<< master/-1,/^>>>>>>> origin/d +/^<<<<<<< /-1,/^>>>>>>> /d w q - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html