Differences From Artifact [66e3f5fa5c]:
- File megatest-version.scm — part of check-in [b63a26d1e6] at 2015-03-15 22:44:48 on branch v1.60 — Merged in json output for -list-runs. Bumped version to 1.6009. (user: matt, size: 159) [annotate] [blame] [check-ins using]
- File megatest-version.scm-baseline — part of check-in [54b2beab6d] at 2015-08-09 21:28:05 on branch v1.60-decoupled-tests — Removed tests dir. Now tests will come from https://www.kiatoa.com/fossils/megatest_qa (user: matt, size: 159) [annotate] [blame] [check-ins using]
To Artifact [8fbe8434ac]:
- File megatest-version.scm — part of check-in [f9f4c1c4ea] at 2015-05-27 20:58:29 on branch borked-merge — Oops. Borked merge to side. (user: matt, size: 501) [annotate] [blame] [check-ins using] [more...]
1 2 3 4 5 6 7 | ;; Always use two or four digit decimal ;; 1.01, 1.02...1.10,1.11,1,1101 ... 1.99,2.00.. (declare (unit megatest-version)) (define megatest-version 1.6009) | > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 | ;; Always use two or four digit decimal ;; 1.01, 1.02...1.10,1.11,1,1101 ... 1.99,2.00.. (declare (unit megatest-version)) <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<< (define megatest-version 1.6014) ======= COMMON ANCESTOR content follows ============================ (define megatest-version 1.6009) ======= MERGED IN content follows ================================== (define megatest-version 1.6013) >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> |