37 ``internal:merge``

    37 .. internaltoolsmarker

    38    Uses the internal non-interactive simple merge algorithm for merging

    39    files. It will fail if there are any conflicts and leave markers in

    40    the partially merged file.

    41 

    42 ``internal:fail``

    43    Rather than attempting to merge files that were modified on both

    44    branches, it marks them as unresolved. The resolve command must be

    45    used to resolve these conflicts.

    46 

    47 ``internal:local``

    48    Uses the local version of files as the merged version.

    49 

    50 ``internal:other``

    51    Uses the other version of files as the merged version.

    52 

    53 ``internal:prompt``

    54    Asks the user which of the local or the other version to keep as

    55    the merged version.

    56 

    57 ``internal:dump``

    58    Creates three versions of the files to merge, containing the

    59    contents of local, other and base. These files can then be used to

    60    perform a merge manually. If the file to be merged is named

    61    ``a.txt``, these files will accordingly be named ``a.txt.local``,

    62    ``a.txt.other`` and ``a.txt.base`` and they will be placed in the

    63    same directory as ``a.txt``.