git-imerge/t
2020-09-19 16:32:42 +02:00
..
.gitignore Fix test scripts' use of directories. 2013-05-11 16:24:09 +02:00
test-conflicted tests: delete some obsolete comments and tidy up set commands 2020-09-19 16:32:42 +02:00
test-drop tests: delete some obsolete comments and tidy up set commands 2020-09-19 16:32:42 +02:00
test-duplicated tests: delete some obsolete comments and tidy up set commands 2020-09-19 16:32:42 +02:00
test-flip-flop test-flip-flop: exhaustively test more variations on the theme 2020-09-19 16:27:31 +02:00
test-lib.sh create_test_repo, delete_test_repo: new test library functions 2020-09-18 14:19:15 +02:00
test-really-conflicted tests: add an example with a bunch of conflicts 2020-09-19 12:57:50 +02:00
test-unconflicted tests: delete some obsolete comments and tidy up set commands 2020-09-19 16:32:42 +02:00