Fossil SCM

← Back to file

test/merge_exe.test

15 commits
Merge from trunk.
ashepilko 19997e99c… 2018-08-02 08:32
Merge trunk
jan.nijtmans d15c1ba0f… 2017-08-31 01:59
Merge trunk
jan.nijtmans 4bf7e4ef5… 2017-03-06 15:32
Merge in latest from trunk
nick.lloyd 85a0ada69… 2016-09-21 16:06
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 trunk
andygoth 6164dac54… 2016-05-23 15:37
merge cleanX
jan.nijtmans 70f77a1b6… 2016-05-21 23:58
Merge trunk
jan.nijtmans a2c0e3f22… 2016-05-21 23:48
Improve the merge command's ability to handle various scenarios involving renames.
drh 41c222093… 2016-05-16 17:46
Properly update the execute bit if it has changed in the commit being merged, and add info about ch…
joel 3683508e9… 2016-05-12 21:11

Keyboard Shortcuts

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