History: src/merge3.c — Fossil SCM

Latest merge from trunk.

brickviking d03791648… 2026-02-10 08:49

Sync with trunk.

florian ceee00be5… 2026-01-10 14:16

Sync with trunk.

florian e4556126d… 2026-01-10 14:10

Sync with trunk.

florian facfbbd55… 2026-01-10 14:04

Sync with trunk.

florian c50c8ed9d… 2026-01-10 14:02

Assorted fixes of typos and grammar in code comments. No functional changes.

danield e2bdc1057… 2025-12-23 16:06

Merge trunk.

danield 02cdfa5e0… 2025-01-04 23:28

Merge from trunk. Sorry if this errors.

brickviking 91639f39e… 2024-12-16 11:09

Merge from trunk

brickviking 0fc2f3d95… 2024-12-16 03:20

Sync with trunk.

florian 878a56bc9… 2024-12-12 17:07

Sync with trunk.

florian 6599ed912… 2024-12-12 17:00

Sync with trunk.

florian 611f20e81… 2024-12-12 16:58

Merge trunk into merge-info-html branch for mergestat improvements.

stephan f0a48c8fa… 2024-12-10 06:25

Merge trunk into merge-info-html branch for mergestat improvements.

stephan f0a48c8fa… 2024-12-10 06:25

Fix a bug in text-merge for the case when the same change occurs along both branches.

drh 58c74fc5c… 2024-12-09 22:51

Move filename info into the corresponding merge-info table. Start adding infrastructure for emittin…

stephan e3a3f0a5f… 2024-12-09 08:17

Get stub table layout in place for merge-info --html. It's not yet clear whether this will suffice.

stephan 5a1da556d… 2024-12-09 07:08

Plug the debug merge builder into the html builder's as-yet-unimplemented methods to assist in thin…

stephan d18f24e2a… 2024-12-07 20:14

Set up the main file list loop for merge_info_html().

stephan 814572550… 2024-12-07 19:52

Use a temp table to consolidate how merge-info --html collects its list of files to process.

stephan 04a868ac2… 2024-12-07 18:21

Add skeleton for the MergeBuilderHtml, but it doesn't do anything right now except for fail to outr…

stephan e76aceba7… 2024-12-07 05:19

Merge from trunk

brickviking f82633155… 2024-12-06 01:42

Fix memory leaks in merge.

drh 337617ba1… 2024-12-05 23:15

When doing a merge, if a merge conflict occurs, a new section appears in the merge conflict marking…

drh 1cf0d372f… 2024-12-05 20:12

Improvements to the merge UI. Fix a mostly-harmless assertion associated with merge marks.

drh 48827897c… 2024-12-05 19:22

In the merge engine, make sure V1 is always used for the local copy and V2 is used for the merge-in.

drh 873b364b9… 2024-12-05 17:13

drh adf226960… 2024-12-05 17:00

Reduced memory requirements in merge_try_to_resolve_conflict().

drh 165156163… 2024-12-05 13:24

Bug fixes sufficient to get the automated merge conflict resolution working.

drh 1174e5f2f… 2024-12-05 13:16

Steps toward doing a better job of automatically resolving merge conflicts. Compiles but does not w…

drh 849c7eb6c… 2024-12-05 12:15

Bug fix in the previous check-in for the "--tk" option on the "3-way-merge" command.

drh d6fa91fdc… 2024-12-04 18:57

Add the "fossil merge-info" command for improved situational awareness on complex merge operations.

drh aa829657f… 2024-12-04 13:40

The "fossil merge-info --tcl FILE" command generates content for the merge.tcl GUI using MERGESTAT …

drh cbd24a259… 2024-12-03 19:20

Add filename labels at the top of each column in the merge display.

drh 7b8be8520… 2024-12-03 13:36

Add the "-c N" option to "fossil 3-way --tk".

drh c4b68636e… 2024-12-03 01:31

Improvements to the new merge display.

drh 7002d98d7… 2024-12-03 01:06

Continuing work on the --tk option to the 3-way-merge command.

drh 57ae422a3… 2024-12-02 21:36

Preliminary implementation of a --tk option to the 3-way-merge command. Lots of work left to do to…

drh bdcacd55b… 2024-11-28 21:54

Add a --tcl option to the 3-way-merge command.

drh 97ab5604e… 2024-11-28 19:13

Refactor the 3-way-merge logic to make it easier to extend and enhance.

drh c4df699fd… 2024-11-28 15:07

Merge trunk into ui-local-diff branch, resolving one merge conflict in info.c:hexdump_page().

stephan d57463cc0… 2024-11-07 06:50

Sync with trunk.

florian 8e6660cd7… 2024-09-06 10:48

Sync with trunk.

florian 00f7466ad… 2024-09-06 10:47

Merge trunk into markdown-tagrefs branch.

stephan 0517bd2dd… 2024-03-05 12:53

Merged trunk. Notably, drh's [bb3de39ffefb3f20] works seamlessly with this branch's skin.

wyoung 4f9cb1d1e… 2024-02-03 23:12

Update with all changes from trunk.

andybradford c454059a1… 2024-02-03 16:55

Fix overlong lines and remove trailing whitespace from non-external C files.

danield 275da70f8… 2024-02-02 22:22

Remove trailing whitespace from non-external C files.

danield 7db0a2d91… 2024-02-02 22:18

Sync with trunk.

florian 759782533… 2024-01-22 13:40

Sync with trunk.

florian f05b04a62… 2024-01-22 13:39

Fossil SCM

src/merge3.c

Keyboard Shortcuts