Display information about the most recent merge operation.

Options:

-a|--all

Show all file changes that happened because of the merge. Normally only MERGE, CONFLICT, and ERROR lines 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

--tk

Bring up a Tcl/Tk GUI that shows the changes associated with the most recent merge.

Options used internally by --tk:

--diff12 FILE

Bring up a separate --tk diff for just the baseline and local variants of FILE.

--diff13 FILE

Like --diff12 but for baseline versus merge-in

--diff23 FILE

Like --diff12 but for local versus merge-in

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

Debugging options available only when --tk is used:

--tkdebug

Show sub-commands run to implement --tk

--script FILE

Write script used to implement --tk into FILE