History: src/merge.tcl — Fossil SCM

Sync with trunk.

florian 931e7065b… 2025-07-21 12:20

Sync with trunk.

florian 75244ee4f… 2025-07-21 12:15

Sync with trunk.

florian a2a1e4a7d… 2025-07-21 12:13

Merge from trunk

brickviking 17efadc96… 2025-02-26 20:14

Bring the merge-info-html branch up to date with trunk, step 2 of 2.

stephan c2b1c2c9f… 2025-02-20 14:46

Bring the merge-info-html branch up to date with trunk, step 1 of 2.

stephan 1140b020d… 2025-02-20 14:32

Enhance the "fossil merge-info --tk" application with a new menu that will bring up detailed two-wa…

drh f5cb12df5… 2025-02-20 13:36

Omit the tearoff from the 2-way diff menu on the merge-info app.

drh f9648f894… 2025-02-20 13:29

Add the --tkdebug command-line option to commands that support --tk. Change the --debug option on …

drh 5548a9111… 2025-02-20 11:13

Improved top-panel button layout on Window for the "fossil merge-into --tk" app.

drh f27e2b0e6… 2025-02-20 00:06

Improve the "fossil merge-info --tk" GUI by adding a new menu to show two-way diffs between selecte…

drh e54a4b5fa… 2025-02-19 21:47

Add the --debug option to "fossil merge-info --tk". Document that and the --script option.

drh 97aee327e… 2025-02-19 17:10

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

Automatically shrink the width of the merge-info --tk GUI so that it fits into the available consol…

drh e75753438… 2024-12-06 10:59

Merge from trunk

brickviking f82633155… 2024-12-06 01:42

Minor width adjustment for the merge-info GUI on Windows.

drh bf1af2e54… 2024-12-05 20:48

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 file selection option-menu in the merge UI.

drh 4582d69e3… 2024-12-05 20:08

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

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

Fix horizontal scrolling in the merge UI.

drh 06df966b1… 2024-12-05 18:56

Merge UI menu buttons working on Darwin.

drh 76b39a2c9… 2024-12-05 18:45

Improvements to how resizing works in the merge --tk UI.

drh e9d1d7166… 2024-12-05 18:00

drh adf226960… 2024-12-05 17:00

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

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

Fix rendering of merge information that contains "N" entries followed by "S".

drh 2ec8a7ae3… 2024-12-04 19:25

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

drh d6fa91fdc… 2024-12-04 18:57

Improved controls at the top of the --tk merge information GUI.

drh f8932be5a… 2024-12-04 18:49

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

drh aa829657f… 2024-12-04 13:40

By default, the merge-info command only shows "interesting" change - actual merges, errors, and con…

drh b764f2d00… 2024-12-04 13:38

The "fossil merge-info --tk" command appears to be working. Probably there are still undiscovered …

drh a199d970a… 2024-12-03 20:37

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

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

Improvements to "3-way --tk"

drh 4a70c64a5… 2024-12-03 12: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

Fossil SCM

src/merge.tcl

Keyboard Shortcuts