Google Git
Sign in
cobalt / pre-commit-hooks / ee30c6ada976001b0cbf12adf1f30af5cc6489d4 / tests / check_merge_conflict_test.py
  1. b13ff9b adjust error outputs to be more standardized by Anthony Sottile · 3 years ago
  2. 8f61529 drop python3.6 support by Anthony Sottile · 3 years, 3 months ago
  3. 07af540 Adjust git dir when checking for merge in worktree by Ersin Yildirim · 3 years, 6 months ago
  4. 10c5e4e forbid-new-submodules: fix triggering failure when only a submodule is committed (without any other file); support --from-ref and --to-ref; fixes #609 by Mikhail Khvoinitsky · 3 years, 10 months ago
  5. f35bfed Don't use LocalPath.strpath by Max Rozentsveyg · 5 years ago
  6. f5c42a0 pre-commit-hooks: python3.6+ by Anthony Sottile · 5 years ago
  7. 8bb94f0 azure pipelines [skip travis] [skip appveyor] by Anthony Sottile · 6 years ago
  8. 030bfac Apply typing to all of pre-commit-hooks by Anthony Sottile · 6 years ago
  9. 64b9f3d Added --assume-in-merge option for check-merge-conflict by Vinay Karanam · 7 years ago
  10. 9b1b44e Remove write_file (now unnecessary) by Anthony Sottile · 7 years ago
  11. da8ab1f pull with --no-rebase by Anthony Sottile · 7 years ago
  12. 4ab7914 Replace deprecated yield_fixture with fixture by Anthony Sottile · 7 years ago
  13. 2a902e0 Use asottile/add-trailing-comma by Anthony Sottile · 8 years ago
  14. 6076fd1 Support rebase conflicts in check-merge-conflicts by Anthony Sottile · 8 years ago
  15. 8be6f4c Remove pylint by Anthony Sottile · 9 years ago
  16. 9e89b76 Increase robustness of tests involving `git` by Sander Maijers · 9 years ago
  17. a99475a Simplify the tests by Anthony Sottile · 9 years ago
  18. 4a01f64 Fix check-merge-conflict against binary files by Anthony Sottile · 9 years ago
  19. c92b465 Add diff3 conflictstyle support for git merge conflicts. by William Ting · 9 years ago
  20. 5c75293 Refactor check-merge-conflicts tests by Alexander Dupuy · 10 years ago
  21. eefc46f Don't report markup titles as merge conflicts by Alexander Dupuy · 10 years ago
  22. 635fa7d Only check merge conflicts on conflict commits by Anthony Sottile · 10 years ago
  23. 779a429 Add check-merge-conflict hook by Guy Kisel · 10 years ago