From: Jon Seymour Date: Sat, 06 Aug 2011 08:44:16 GMT Subject: [PATCH 02/40] whitespace: remediate t1001-read-tree-m-2way.sh Message-ID: <1312620294-18616-2-git-send-email-jon.seymour@gmail.com> In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com> 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 --- t/t1001-read-tree-m-2way.sh | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh index acaab07..141a35a 100755 --- a/t/t1001-read-tree-m-2way.sh +++ b/t/t1001-read-tree-m-2way.sh @@ -14,11 +14,11 @@ all the combinations described in the two-tree merge "carry forward" rules, found in . In the test, these paths are used: - bozbar - in H, stays in M, modified from bozbar to gnusto - frotz - not in H added in M - nitfol - in H, stays in M unmodified - rezrov - in H, deleted in M - yomin - not in H nor M + bozbar - in H, stays in M, modified from bozbar to gnusto + frotz - not in H added in M + nitfol - in H, stays in M unmodified + rezrov - in H, deleted in M + yomin - not in H nor M ' . ./test-lib.sh . "$TEST_DIRECTORY"/lib-read-tree.sh -- 1.7.6.362.gf0e6