This file was edited by applying: expand -i | unexpand --first-only | sed "s/ *$//" to the file. No change to test outputs or status code was observed. Signed-off-by: Jon Seymour <jon.seymour@xxxxxxxxx> --- t/t1000-read-tree-m-3way.sh | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/t/t1000-read-tree-m-3way.sh b/t/t1000-read-tree-m-3way.sh index babcdd2..b461b42 100755 --- a/t/t1000-read-tree-m-3way.sh +++ b/t/t1000-read-tree-m-3way.sh @@ -169,7 +169,7 @@ checked. 3 missing exists missing take A* must match A, if exists. ------------------------------------------------------------------ 4 missing exists A!=B no merge must match A and be - up-to-date, if exists. + up-to-date, if exists. ------------------------------------------------------------------ 5 missing exists A==B take A must match A, if exists. ------------------------------------------------------------------ @@ -180,21 +180,21 @@ checked. 8 exists missing O==B remove must not exist. ------------------------------------------------------------------ 9 exists O!=A missing no merge must match A and be - up-to-date, if exists. + up-to-date, if exists. ------------------------------------------------------------------ 10 exists O==A missing no merge must match A ------------------------------------------------------------------ 11 exists O!=A O!=B no merge must match A and be - A!=B up-to-date, if exists. + A!=B up-to-date, if exists. ------------------------------------------------------------------ 12 exists O!=A O!=B take A must match A, if exists. - A==B + A==B ------------------------------------------------------------------ 13 exists O!=A O==B take A must match A, if exists. ------------------------------------------------------------------ 14 exists O==A O!=B take B if exists, must either (1) - match A and be up-to-date, - or (2) match B. + match A and be up-to-date, + or (2) match B. ------------------------------------------------------------------ 15 exists O==A O==B take B must match A if exists. ------------------------------------------------------------------ -- 1.7.6.362.gf0e6 -- To unsubscribe from this list: 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