Google Git
Sign in
cobalt / pre-commit-hooks / 030bfac7e40b0c009d234c3d6a2ef2baf9dede5a / tests / check_merge_conflict_test.py
  1. 030bfac Apply typing to all of pre-commit-hooks by Anthony Sottile · 6 years ago
  2. 64b9f3d Added --assume-in-merge option for check-merge-conflict by Vinay Karanam · 7 years ago
  3. 9b1b44e Remove write_file (now unnecessary) by Anthony Sottile · 7 years ago
  4. da8ab1f pull with --no-rebase by Anthony Sottile · 7 years ago
  5. 4ab7914 Replace deprecated yield_fixture with fixture by Anthony Sottile · 7 years ago
  6. 2a902e0 Use asottile/add-trailing-comma by Anthony Sottile · 8 years ago
  7. 6076fd1 Support rebase conflicts in check-merge-conflicts by Anthony Sottile · 8 years ago
  8. 8be6f4c Remove pylint by Anthony Sottile · 9 years ago
  9. 9e89b76 Increase robustness of tests involving `git` by Sander Maijers · 9 years ago
  10. a99475a Simplify the tests by Anthony Sottile · 9 years ago
  11. 4a01f64 Fix check-merge-conflict against binary files by Anthony Sottile · 9 years ago
  12. c92b465 Add diff3 conflictstyle support for git merge conflicts. by William Ting · 9 years ago
  13. 5c75293 Refactor check-merge-conflicts tests by Alexander Dupuy · 10 years ago
  14. eefc46f Don't report markup titles as merge conflicts by Alexander Dupuy · 10 years ago
  15. 635fa7d Only check merge conflicts on conflict commits by Anthony Sottile · 10 years ago
  16. 779a429 Add check-merge-conflict hook by Guy Kisel · 10 years ago