remove trailing whitespace introduced in cfeeac24fc1e

templates/coal: spell class correctly in {fileentry}

repo: add rjoin method

parseurl: make revs optional

Hoist localpath to the top level

test-imerge: disable due to massive brokenness

use internal merge tool when specified for a merge-pattern in hgrc It is possible to specify in the hgrc file that one of the internal merge tools (internal:fail, internal:local or internal:other) be used for performing merges on files matching a given pattern. However, this setting is not being acted upon (the merge tool is not found). This patch fixes that.

test that internal merge tools are used when set for a merge-pattern in hgrc It is possible to specify that one of the internal merge tools (internal:fail, internal:local or internal:other) should be used for performing merges on files matching a given pattern. This test makes sure that such a setting actually works.

fix import with -p0

context: handle untracked files in filectx.fileflags()