Fossil

File History
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

History of test/merge3.test

2016-11-07
01:29
Remove some tabs and end-of-line whitespace file: [d65569d6] check-in: [bf9669f5] user: andygoth branch: trunk, size: 8909
2016-03-02
20:43
Rename the test suite procedure 'repo_init' to 'test_setup'. file: [70db9ae7] check-in: [413921cc] 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: [1fdf46ca] check-in: [3a578e04] user: mistachkin branch: testerCleanup, size: 8910
06:45
More work... file: [0e814134] check-in: [29f0328c] 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: [637ad527] check-in: [8b47f2d2] 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: [f224461c] check-in: [792a3bc9] 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: [860f092f] check-in: [1092a1df] 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: [55d4bb7f] check-in: [9d723c57] 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: [95294bf4] check-in: [f89d953a] 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: [e745bf69] check-in: [92638367] user: drh branch: trunk, size: 8240
2009-03-21
19:44
Additional 3-way-merge test cases. file: [f3315ba4] check-in: [26ab4f70] user: drh branch: trunk, size: 3076 Added