-
Notifications
You must be signed in to change notification settings - Fork 110
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #313 from FlTr/windows-paths-and-patch-file
Normalize paths from patch file
- Loading branch information
Showing
3 changed files
with
24 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
tests/testdata/test_patches/edit_existing_line_in_subfolder.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
diff --git a/sub/existing_file.txt b/sub/existing_file.txt | ||
index 272b2e4..9767587 100644 | ||
--- a/sub/existing_file.txt | ||
+++ b/sub/existing_file.txt | ||
@@ -1,3 +1,3 @@ | ||
first line | ||
-second line | ||
+second line is edited | ||
third line | ||
\ No newline at end of file |