Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
8 check-ins using file src/merge.c version 0735646a51
|
2012-08-20
| ||
| 13:20 | Fixing the automatic calculation of sbs line length, for the case of TABs and UTF8 sequences. I also set the tab size to 4 spaces. check-in: 36cdc17cc8 user: viriketo tags: annotate_links | |
|
2012-08-08
| ||
| 13:46 | Updating from trunk. I solved three merge conflicts about hyperlinks. check-in: 08db320464 user: viriketo tags: annotate_links | |
|
2012-04-22
| ||
| 10:09 | Merging from trunk. I solved some conflicts on the report for merges (cherrypick/...), adding some comments, and adopted the trunk solution to unchanged checkin messages. check-in: 40debe4782 user: viriketo tags: annotate_links | |
| 09:56 | Fix a comment in my previous commit. check-in: 515e7fa0c8 user: viriketo tags: annotate_links | |
| 09:50 | I change the branch colour algorithm, for another one I can understand better. No HSV magic; simply few combinations of RGB values based on hash. This algorithm should give either different or equal colours, and not similar colours. This way I think the hash differences are more likely to give different colours. I had the feeling that we were get... check-in: 243d99d128 user: viriketo tags: annotate_links | |
|
2012-04-05
| ||
| 14:31 | Made 'fossil commit' detect if the editor changed the file. If the editor did not change the file, ask confirmation, as if it was an empty comment. I think svn behaves this way. check-in: d2a733beda user: viriketo tags: annotate_links | |
| 14:19 | Allowing partial commit for merges not adding a parent to the checkin. check-in: a610b2567f user: viriketo tags: annotate_links | |
| 14:05 | I make 'merge --baseline' not introduce a new parent in the merge checkin. I think it should behave like --cherrypick. check-in: ba402f33b2 user: viriketo tags: annotate_links | |