Login
All files named "f-apps/f-merge.c"
Login

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

History for f-apps/f-merge.c

2022-09-15
07:14
f-merge: perform autosync-pull before merging. file: [fe632f2cdd] check-in: [10bedd2e61] user: stephan branch: trunk, size: 8214
2022-06-11
13:05
Expanded the label for the 'no common ancestor found' case in f-merge's legend, to indicate that it refers to new content rateher than a genuine conflict, but probably need to find a different merge state code for that case file: [d705f4de36] check-in: [bbb7322a75] user: stephan branch: trunk, size: 7663
12:49
f-merge now unconditionally shows the symbolic name legend if any files are modified by the merge. TODO: figure out how we can make the 'no common ancestor found' report for new merged-in files less scary. file: [c30078e2e4] check-in: [8ba74c252f] user: stephan branch: trunk, size: 7610
2021-12-31
21:33
f-merge now defaults to wet-run mode. file: [2b30f92f0a] check-in: [f3a4ba9472] user: stephan branch: trunk, size: 7788
2021-12-21
08:28
Moved fossil-scm/fossil.h to ../libfossil.h so that client code can build from both the canonical tree and amalgamation using the same include name. file: [b1b42b0ea5] check-in: [76d6359435] user: stephan branch: trunk, size: 8040
2021-12-15
12:47
Renamed f-apps/f-test-merge.c → f-apps/f-merge.c. Moved fsl_ckout_merge() code from f-test-merge.c to src/merge.c. Renamed f-test-merge.c to f-merge.c. Various touchups in f-merge. file: [127a513e8c] check-in: [661999bcc7] user: stephan branch: trunk, size: 8090