SQLite Archiver

Help: merge-info
Login

The "merge-info" command:

Usage: fossil merge-info [OPTIONS]

Display information about the most recent merge operation.

Right now, this command basically just dumps the localdb.mergestat table. The plan moving forward is that it can generate data for a Tk-based GUI to show the details of the merge. This command is a work-in-progress.

Options:

-a|--all
Show all changes. Normally only merges, conflicts, and errors are shown.
-c|--context N
Show N lines of context around each change, with negative N meaning show all content. Only meaningful in combination with --tcl or --tk.
--dark
Use dark mode for the Tcl/Tk-based GUI
--tcl FILE
Generate (to stdout) a TCL list containing information needed to display the changes to FILE caused by the most recent merge. FILE must be a pathname relative to the root of the check-out.
--tk
Bring up a Tcl/Tk GUI that shows the changes associated with the most recent merge.