merge: don't unnecessarily calculate absolute path
I think this also makes the code clearer (and prepares for a later
patch that replaces origpath()).
Differential Revision: https://phab.mercurial-scm.org/D5849
# See http://EditorConfig.org for the specification
root = true
[*.py]
indent_size = 4
indent_style = space
trim_trailing_whitespace = true
[*.{c,h}]
indent_size = 8
indent_style = tab
trim_trailing_whitespace = true
[*.t]
indent_size = 2
indent_style = space
trim_trailing_whitespace = false