Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tests: merge & merge conflict #3

Merged
merged 7 commits into from
Feb 24, 2024
Merged

tests: merge & merge conflict #3

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4202c73
tests: merge & merge conflict
Feb 21, 2024
61e4672
fix merge conflict test
Feb 21, 2024
ec07087
fix commit message titles
Feb 21, 2024
e3f9ffa
update merge test
Feb 22, 2024
5aa4872
consolidate to one file
Feb 22, 2024
ba22b7c
remove dead code
Feb 22, 2024
e87ba13
Update tests/git_merge.py
carlini Feb 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Update tests/git_merge.py 
Co-authored-by: Atarust <jonas.kapitzke@gmail.com>
  • Loading branch information
@carlini @Atarust
carlini and Atarust committed Feb 24, 2024
commit e87ba13181aedc624165550c1a0fd839b3bcc05c
2 changes: 0 additions & 2 deletions tests/git_merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ def test_merge_conflict_resolved():
except:
return False

return success


def setup_merge():
import os
Expand Down