equal
deleted
inserted
replaced
854 Allow to prompt the user. True or False. Default is True. |
854 Allow to prompt the user. True or False. Default is True. |
855 ``logtemplate`` |
855 ``logtemplate`` |
856 Template string for commands that print changesets. |
856 Template string for commands that print changesets. |
857 ``merge`` |
857 ``merge`` |
858 The conflict resolution program to use during a manual merge. |
858 The conflict resolution program to use during a manual merge. |
859 There are some internal tools available: |
859 For more information on merge tools see :hg:`help merge-tools`. |
860 |
860 For configuring merge tools see the merge-tools_ section. |
861 ``internal:local`` |
|
862 keep the local version |
|
863 ``internal:other`` |
|
864 use the other version |
|
865 ``internal:merge`` |
|
866 use the internal non-interactive merge tool |
|
867 ``internal:fail`` |
|
868 fail to merge |
|
869 |
|
870 For more information on configuring merge tools see the |
|
871 merge-tools_ section. |
|
872 |
|
873 ``patch`` |
861 ``patch`` |
874 command to use to apply patches. Look for ``gpatch`` or ``patch`` in |
862 command to use to apply patches. Look for ``gpatch`` or ``patch`` in |
875 PATH if unset. |
863 PATH if unset. |
876 ``quiet`` |
864 ``quiet`` |
877 Reduce the amount of output printed. True or False. Default is False. |
865 Reduce the amount of output printed. True or False. Default is False. |