Fossil SCM

← Back to file

test/merge_warn.test

22 commits
Merge trunk into ui-local-diff branch, resolving one merge conflict in info.c:hexdump_page().
stephan d57463cc0… 2024-11-07 06:50
Merge trunk into markdown-tagrefs branch.
stephan 0517bd2dd… 2024-03-05 12:53
Update with all changes from trunk.
andybradford c454059a1… 2024-02-03 16:55
Sync with trunk.
florian 759782533… 2024-01-22 13:40
Sync with trunk.
florian f05b04a62… 2024-01-22 13:39
Merge current state of testing-improvements. make clean output is now easy to review.
preben e5bcfd1ef… 2024-01-12 15:48
Add -expectError to a number of tests that are expected to generate errors or output.
preben 768d93e6e… 2024-01-10 09:36
Merge in trunk to include recent test changes.
preben 383087bfa… 2024-01-10 08:29
Test fixes for 2.24 as discussed in [forum:8d774bc3610fe8de|forum post 8d774bc3610fe8de].
preben 271a978d9… 2024-01-04 09:58
Fix merge_warn.test: warning about missing common ancestor changed to merge conflict warning. 👀
florian c38c0ff74… 2023-11-05 12:42
Merge from trunk.
ashepilko 19997e99c… 2018-08-02 08:32
Merge trunk
jan.nijtmans d15c1ba0f… 2017-08-31 01:59
Merge with trunk; resolved tar and zip generation to handle include/exclude globs.
jan de9e7651a… 2016-08-03 01:18
Merge in trunk and resolve conflict.
andybradford 003b6581e… 2016-07-04 20:13
merge trunk
jan.nijtmans 414fc1e95… 2016-06-22 09:11
merge from trunk with a few tweaks for merge conflicts
scott 598b58a5e… 2016-05-31 08:17
Merge trunk
andygoth ca59c662d… 2016-05-23 15:46
Merge trunk
andygoth 83bd4f37b… 2016-05-23 15:45
merge cleanX
jan.nijtmans 70f77a1b6… 2016-05-21 23:58
Merge trunk
jan.nijtmans a2c0e3f22… 2016-05-21 23:48
Merged trunk and resolved conflicts. Passes all current tests.
rberteig 8c8ccac9b… 2016-05-03 08:17
Minor edits to unify merge command warning messages, plus tests.
joel 451f04f6f… 2016-04-18 21:57

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button