History: src/merge.c — Fossil SCM

Make merge a no-op when merging in the current checkout version, as suggested in [forum:6367db867c|…

stephan e84be9f2d… 2026-03-30 12:21

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

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

Merge from trunk.

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

Minor optimization: replace calls to mprintf("%s", X) with fossil_strdup(X).

danield 4c3e1728e… 2025-07-23 15:58

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

Fix `fossil clean` on symlinks by refactoring file_isfile_or_link() to take eFType as well, so that…

js 4b6dbb2e3… 2025-06-21 23:36

Fix `fossil clean` on symlinks by refactoring file_isfile_or_link() to take eFType as well, so that…

js 9e06f72b7… 2025-06-15 17:12

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

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

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.

brickviking 8add3c418… 2024-12-22 20:42

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.

brickviking 704b75e85… 2024-12-16 20:09

Add missing word in the help text for 'merge'.

danield bdc6bb1cf… 2024-12-16 16:22

Fix a bug in the "fossil patch pull" command that caused "fossil revert" that occurs after a "fossi…

drh 3a39ae4c8… 2024-12-16 16:17

Do not sync or fill the undo log when running subcommands due to patch.

drh cf8f0e4d3… 2024-12-16 16:15

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

Record merge-info information for the "fossil update" command.

drh 3a18c95df… 2024-12-09 17:38

The output from "fossil merge-info" appears in priority order: CONFLICT first, then MERGE, then ot…

drh 0b5dfa9f6… 2024-12-09 16:47

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

Fossil SCM

src/merge.c

Keyboard Shortcuts