diff options
Diffstat (limited to 'test/integration/mergeConflicts/expected/repo/cherrypicking2')
| -rw-r--r-- | test/integration/mergeConflicts/expected/repo/cherrypicking2 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/test/integration/mergeConflicts/expected/repo/cherrypicking2 b/test/integration/mergeConflicts/expected/repo/cherrypicking2 deleted file mode 100644 index 889b0fdfe..000000000 --- a/test/integration/mergeConflicts/expected/repo/cherrypicking2 +++ /dev/null @@ -1 +0,0 @@ -this is file number 2 that I'm going to cherry-pick |