Page MenuHomePhabricator

simplemerge: use same newline detection for :mergediff as for :merge[3]
ClosedPublic

Authored by martinvonz on Wed, Jan 12, 1:55 AM.

Details

Summary

The :merge and :merge3 markers used the newline style detected
from the base input. The :mergediff style always used LF as newline
character. This patch teaches :mergediff to use the same detection
as the others did.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.