History: src/diff.tcl — Fossil SCM

Merge from trunk.

brickviking 0ffacb525… 2025-10-23 08:14

Sync with trunk.

florian 286a90069… 2025-08-21 12:08

Sync with trunk.

florian a0377ebb9… 2025-08-21 12:07

Sync with trunk.

florian 5ee83f280… 2025-08-21 12:06

Sync with trunk.

florian bab295db1… 2025-08-21 12:04

Fix diff -tk's handling of the file list when the Reload button is tapped and the list of files is …

stephan 4bb41f924… 2025-08-01 13:03

Merge from trunk.

brickviking 53010e968… 2025-07-28 02:32

Sync with trunk.

florian e17d35e79… 2025-07-21 12:23

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 current trunk

jkosche 8cbcf36be… 2025-05-24 16:31

Merge trunk

js f993a870a… 2025-05-18 02:50

In the --tk diff GUI, fix the "Save As..." button so that it works again. Do not show the "Reload"…

drh 31fc6290c… 2025-05-06 11:26

Merge trunk into the merge-info-trunk branch.

stephan 1014ffb55… 2025-03-27 12:42

Merge from trunk.

brickviking 3eac814da… 2025-03-20 21:13

Add the "Reload" button to the --tk diff viewer.

drh 37407fe61… 2025-03-17 17:55

Improved error message when --tk fails.

drh 8dcb0b8a5… 2025-03-17 16:53

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

Fix issues with column names in diff.tcl

drh 0aceaa3b2… 2025-02-20 13:24

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

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

New mechanism for doing 2-way diffs in merge-info that does not require the new "fdiff" command - t…

drh 3f3e30195… 2025-02-20 02:46

Avoid putting extraneous text after the filenames in column labels for xdiff and fdiff.

drh 0743cfc2e… 2025-02-19 21:54

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

Merge trunk.

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

Sync with trunk.

florian 5fbb14f73… 2024-12-17 06:56

Sync with trunk.

florian 361fc7676… 2024-12-17 06:36

Sync with trunk.

florian 215fc593d… 2024-12-17 06:26

Merge from trunk. Sorry if this errors.

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

Merge from trunk

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

Add the --external-baseline option to the "fossil diff" command, plus some minor name refactoring i…

drh 99d0baa61… 2024-12-14 20:41

Change the name of the --tree option to --external-baseline.

drh 356163b05… 2024-12-14 20:40

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 from trunk

brickviking f82633155… 2024-12-06 01:42

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

drh aa829657f… 2024-12-04 13:40

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

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

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

stephan d57463cc0… 2024-11-07 06:50

Merge trunk into markdown-tagrefs branch.

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

Update with all changes from trunk.

andybradford c454059a1… 2024-02-03 16:55

Sync with trunk.

florian 759782533… 2024-01-22 13:40

Sync with trunk.

florian f05b04a62… 2024-01-22 13:39

Merge in trunk to include recent test changes.

preben 383087bfa… 2024-01-10 08:29

Add the --dark option to "fossil diff --tk"

drh 5a8516df5… 2023-12-07 20:06

Provide a dark mode for the TCL/TK-based diff GUI.

danield b59a42f1f… 2023-12-05 16:02

Merge updates from trunk.

mistachkin e3df21cdf… 2023-05-21 03:37

Fossil SCM

src/diff.tcl

Keyboard Shortcuts