Normalizing line endings. Settled on \r\n because we already have the SHA for these values.

Author: J Wyman

LibGit2Sharp.Tests/RebaseFixture.cs

@@ -718,29 +718,29 @@ private void ConstructRebaseTestRepository(Repository repo)
 
             Branch masterBranch1 = repo.CreateBranch(masterBranch1Name, commit);
 
-            Touch(workdir, filePathB, string.Join(Environment.NewLine, fileContentB1, fileContentB2));
+            Touch(workdir, filePathB, string.Join("\r\n", fileContentB1, fileContentB2));
             repo.Stage(filePathB);
             commit = repo.Commit("commit 4", Constants.Signature, Constants.Signature, new CommitOptions());
 
-            Touch(workdir, filePathB, string.Join(Environment.NewLine, fileContentB1, fileContentB2, fileContentB3));
+            Touch(workdir, filePathB, string.Join("\r\n", fileContentB1, fileContentB2, fileContentB3));
             repo.Stage(filePathB);
             commit = repo.Commit("commit 5", Constants.Signature, Constants.Signature, new CommitOptions());
 
-            Touch(workdir, filePathB, string.Join(Environment.NewLine, fileContentB1, fileContentB2, fileContentB3, fileContentB4));
+            Touch(workdir, filePathB, string.Join("\r\n", fileContentB1, fileContentB2, fileContentB3, fileContentB4));
             repo.Stage(filePathB);
             commit = repo.Commit("commit 6", Constants.Signature, Constants.Signature, new CommitOptions());
 
             repo.CreateBranch(topicBranch1Name, commit);
 
-            Touch(workdir, filePathC, string.Join(Environment.NewLine, fileContentC1, fileContentC2));
+            Touch(workdir, filePathC, string.Join("\r\n", fileContentC1, fileContentC2));
             repo.Stage(filePathC);
             commit = repo.Commit("commit 7", Constants.Signature, Constants.Signature, new CommitOptions());
 
-            Touch(workdir, filePathC, string.Join(Environment.NewLine, fileContentC1, fileContentC2, fileContentC3));
+            Touch(workdir, filePathC, string.Join("\r\n", fileContentC1, fileContentC2, fileContentC3));
             repo.Stage(filePathC);
             commit = repo.Commit("commit 8", Constants.Signature, Constants.Signature, new CommitOptions());
 
-            Touch(workdir, filePathC, string.Join(Environment.NewLine, fileContentC1, fileContentC2, fileContentC3, fileContentC4));
+            Touch(workdir, filePathC, string.Join("\r\n", fileContentC1, fileContentC2, fileContentC3, fileContentC4));
             repo.Stage(filePathC);
             commit = repo.Commit("commit 9", Constants.Signature, Constants.Signature, new CommitOptions());
 
@@ -751,18 +751,18 @@ private void ConstructRebaseTestRepository(Repository repo)
             repo.Stage(filePathD);
             commit = repo.Commit("commit 10", Constants.Signature, Constants.Signature, new CommitOptions());
 
-            Touch(workdir, filePathD, string.Join(Environment.NewLine, fileContentD1, fileContentD2));
+            Touch(workdir, filePathD, string.Join("\r\n", fileContentD1, fileContentD2));
             repo.Stage(filePathD);
             commit = repo.Commit("commit 11", Constants.Signature, Constants.Signature, new CommitOptions());
 
-            Touch(workdir, filePathD, string.Join(Environment.NewLine, fileContentD1, fileContentD2, fileContentD3));
+            Touch(workdir, filePathD, string.Join("\r\n", fileContentD1, fileContentD2, fileContentD3));
             repo.Stage(filePathD);
             commit = repo.Commit("commit 12", Constants.Signature, Constants.Signature, new CommitOptions());
 
             repo.CreateBranch(masterBranch2Name, commit);
 
             // Create commit / branch that conflicts with T1 and T2
-            Touch(workdir, filePathB, string.Join(Environment.NewLine, fileContentB1, fileContentB2 + fileContentB3 + fileContentB4));
+            Touch(workdir, filePathB, string.Join("\r\n", fileContentB1, fileContentB2 + fileContentB3 + fileContentB4));
             repo.Stage(filePathB);
             commit = repo.Commit("commit 13", Constants.Signature, Constants.Signature, new CommitOptions());
             repo.CreateBranch(conflictBranch1Name, commit);