comparison mercurial/configitems.py @ 39420:56469d475341

resolve: add config to make hg resolve not re-merge by default

Before this, calling 'hg resolve' with neither -m, -u or -l will
re-merge. This is highly error prone (it's easy to forget to forget a
-m), and pretty bad when it happens (many people have no idea 'hg
resolve' can re-merge, and end up redoing the work of resolving all
the conflicts, because they have no idea there was a backup of their
work).

Differential Revision: https://phab.mercurial-scm.org/D4379

39419:5d00e6061ba2

    default=False,
)
coreconfigitem('commands', 'resolve.confirm',
    default=False,
)
coreconfigitem('commands', 'resolve.mark-check',
    default='none',
)
coreconfigitem('commands', 'show.aliasprefix',
    default=list,

39420:56469d475341

    default=False,
)
coreconfigitem('commands', 'resolve.confirm',
    default=False,
)
coreconfigitem('commands', 'resolve.explicit-re-merge',
    default=False,
)
coreconfigitem('commands', 'resolve.mark-check',
    default='none',
)
coreconfigitem('commands', 'show.aliasprefix',
    default=list,