merge-info

vb merge-info [OPTIONS]

Description

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.

Internally –tk options

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

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 FILEE

Examples

  • Create a branch, merge it, then view merge-info summary

$ vb ci -m "base"
Committed version: dc0b20507528b0e36df463ff917b4e015ed1246b2e1faf7e38131bbbad7969b8
$ vb ci -m "feature work" --branch feature/x
Committed version: 634a87b2ae25f0c152183d8deff5e3343aeacc02dbbd7475dc4b1571aa56fa68
$ vb update trunk
UPDATE app.txt
UPDATE readme.md
-------------------------------------------------------------------------------
updated-from: 634a87b2ae25f0c152183d8deff5e3343aeacc02 2026-03-20 03:03:29 UTC
updated-to:   dc0b20507528b0e36df463ff917b4e015ed1246b 2026-03-20 03:03:29 UTC
tags:         trunk
comment:      base (user: ubuntu)
changes:      2 files modified.
 "vb undo" is available to undo changes to the working checkout.
$ vb merge feature/x
UPDATE app.txt
UPDATE readme.md
 "vb undo" is available to undo changes to the working checkout.
$ vb ci -m "merge feature/x"
Committed version: 8a40e87d43e2d10ecdc7ab2fc7d8b64e940250f7f01b2cc9739533fd394361c5
$ vb merge-info
No interesting changes in this merge.  Use --all to see everything.
  • Show all file changes from the most recent merge (-a)

$ vb merge-info -a
UPDATE    app.txt
UPDATE    readme.md