Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
History of file test/merge3.test at check-in 4a5352c25d787989
|
2024-12-19
| ||
| 16:46 | Update the tests to reflect the current state of development. ... (file: [363f507792] check-in: [6aee052f00] user: florian branch: trunk, size: 9832) | |
|
2024-01-10
| ||
| 09:36 | Add -expectError to a number of tests that are expected to generate errors or output. ... (file: [0562a7c4de] check-in: [768d93e6ee] user: preben branch: testing-improvements, size: 9348) | |
|
2023-11-05
| ||
| 12:30 | Fix merge3.test: changed merge conflict warnings. ... (file: [7949771e12] check-in: [3e61910072] user: florian branch: test-fixes-2.24, size: 8990) | |
|
2020-07-31
| ||
| 02:21 | Update the tests to reflect recent code changes ... (file: [3ff4854352] check-in: [981049f798] user: ashepilko branch: trunk, size: 8919) | |
|
2016-11-07
| ||
| 01:29 | Remove some tabs and end-of-line whitespace ... (file: [d65569d68f] check-in: [bf9669f55e] user: andygoth branch: trunk, size: 8909) | |
|
2016-03-02
| ||
| 20:43 | Rename the test suite procedure 'repo_init' to 'test_setup'. ... (file: [70db9ae7c6] check-in: [413921cca0] user: mistachkin branch: testerCleanup, size: 8911) | |
| 08:13 | All test files must now call 'repo_init', using an empty string if they do not require a new repository. ... (file: [1fdf46caa4] check-in: [3a578e0495] user: mistachkin branch: testerCleanup, size: 8910) | |
| 06:45 | More work... ... (file: [0e8141342f] check-in: [29f0328cd9] user: mistachkin branch: testerCleanup, size: 8896) | |
|
2013-07-24
| ||
| 12:27 | Fix some test-cases, due to name-change "test-3-way-merge" -> "3-way-merge" ... (file: [637ad52756] check-in: [8b47f2d270] user: jan.nijtmans branch: trunk, size: 8801) | |
|
2011-04-18
| ||
| 23:46 | Enhance the merge-conflict notation to show both the two recent versions and also the common ancestor version. ... (file: [f224461c6e] check-in: [792a3bc94a] user: drh branch: trunk, size: 8806) | |
|
2010-12-22
| ||
| 01:32 | Fix up all of the test scripts so that the test results match the latest fossil output. Ticket [4f43f7ff92ae02ae3] ... (file: [860f092f47] check-in: [1092a1df55] user: drh branch: trunk, size: 7992) | |
|
2010-12-11
| ||
| 16:36 | Add the --tag option to the "commit" command. Add new test cases that make use of the --tag option. Improvements to the testing infrastructure. ... (file: [55d4bb7f26] check-in: [9d723c57ea] user: drh branch: trunk, size: 7978) | |
|
2010-10-30
| ||
| 19:05 | applied patch from ticket [aa01499923] and added option -prot to test tcl script which optionally writes a protocol file ... (file: [95294bf43a] check-in: [f89d953a06] user: wolfgang branch: trunk, size: 8246) | |
|
2009-03-22
| ||
| 13:18 | Add many new test cases for 3-way merge. No new problems found. ... (file: [e745bf699d] check-in: [92638367d8] user: drh branch: trunk, size: 8240) | |
|
2009-03-21
| ||
| 19:44 | Additional 3-way-merge test cases. ... (file: [f3315ba437] check-in: [26ab4f7012] user: drh branch: trunk, size: 3076) | |