diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-03-27 11:47:07 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-03-27 14:58:20 +1100 |
| commit | 20ec6d98ad7581e985d066a37346f3193a44fc93 (patch) | |
| tree | 13eac6bd52d5b821091cb2c76a92dbb10dd22a6b /test/integration/mergeConflicts/expected/repo/cherrypicking2 | |
| parent | 2b3d457aa44821a7d0c1705a510a5567e44a07da (diff) | |
refactor integration tests
Diffstat (limited to 'test/integration/mergeConflicts/expected/repo/cherrypicking2')
| -rw-r--r-- | test/integration/mergeConflicts/expected/repo/cherrypicking2 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/integration/mergeConflicts/expected/repo/cherrypicking2 b/test/integration/mergeConflicts/expected/repo/cherrypicking2 new file mode 100644 index 000000000..889b0fdfe --- /dev/null +++ b/test/integration/mergeConflicts/expected/repo/cherrypicking2 @@ -0,0 +1 @@ +this is file number 2 that I'm going to cherry-pick |