bk remerge(7.3ce) BitKeeper User's Manual bk remerge(7.3ce)
NAME
bk remerge - redo the last merge
SYNOPSIS
bk remerge [-T] <file> [<file> ...]
DESCRIPTION
The bk remerge looks at the specified file[s] and tries to remerge the
last merge. Each file may not be edited with modifications and must
have a merge as the most recent delta; files not meeting these require-
ments are skipped.
The merged file is left as the current working file after the merge is
completed. The merge may be graphical (default) or text based. In the
latter case, the marked up file is left as the working file and you
must manually edit it to complete the merge.
OPTIONS
-T Use a text based merge tool.
SEE ALSO
bk fm3tool
bk smerge
CATEGORY
File
BitKeeper Inc 1E1 bk remerge(7.3ce)
File