Skip to content
← semanticmerge

The merge tool that understands your code

semanticmerge

Categories

JUMP TO ANOTHER FORUM

(thinking…)

Mergetool options should be sticky and configurable

It should be possible to set the different merge options in a config file or via the parameters (in mercurial.ini or something like that).

Running a big merge with a lot of whitespace issues forces me to options> comparison >"ignore EOL and whitespace" hundreds (!) of times as it is not sticky between merges.

6 votes
Vote

We're glad you're here

Please sign in to leave feedback
Signed in as (Sign out)
Close
Close
You have left! (?) (thinking…)
Christian Dalager shared this idea  ·   ·  Report…  ·  Admin →

We're glad you're here

Please sign in to leave feedback
Signed in as (Sign out)
Close
Close
Submitting...
An error occurred while saving the comment
  • Miryam commented  ·   ·  Report

    Hi,

    The comparison method is an option of the external merge tool.
    You can configure it with the --ignore option, which accepts the following values: none, eol, whitespaces, eol&whitespaces

    Example:

    semanticmergetool.exe -s=src.cs -b=base.cs -d=dst.cs -r=result.cs -emt="mergetool.exe -s="#sourcefile" -b="#basefile" -d="#destinationfile" -r="#output" --ignore=eol&whitespaces" -edt="mergetool.exe -s="#sourcefile" -d="#destinationfile" --ignore=eol&whitespaces"