log mercurial/commands.py @ 38955:49b51f41fb46

age author description
Mon, 06 Aug 2018 10:03:57 +0530 Sushil khanchi resolve: organize 'if confirm' conditionals
Sat, 04 Aug 2018 12:43:41 +0530 Sushil khanchi resolve: support confirm config option with --unmark flag
Sun, 05 Aug 2018 00:53:55 -0700 Kyle Lippincott resolve: correct behavior of mark-check=none to match docs
Sat, 04 Aug 2018 12:23:18 +0530 Sushil khanchi resolve: support commands.resolve.confirm option with --mark flag
Fri, 03 Aug 2018 12:57:44 -0700 Kyle Lippincott resolve: graduate resolve.mark-check from experimental, add docs
Tue, 31 Jul 2018 19:11:17 +0530 Sushil khanchi resolve: add confirm config option
Thu, 26 Jul 2018 17:11:03 -0700 Kyle Lippincott resolve: add option to warn/abort on -m with unresolved conflict markers