Keyword extension - merge/resolve

Ezra.Smith at Ezra.Smith at
Thu Aug 21 09:52:11 CDT 2008

Hi Christian,

I've gotten a few questions recently from coworkers who are merging
files while using the keyword extension. In cases where there isn't a
real merge conflict, they still have a conflict between the expanded
{date} tags in the two revisions they're trying to merge. Is there a
reason why merge and resolve aren't part of nokwcommands in the keyword
extension? Adding them to nokwcommands solves the problem, but I'd like
to make sure I'm not causing any new or unexpected issues by adding
merge and resolve to the exclusion list.


More information about the Mercurial-devel mailing list