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

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