Mercurial merge strategy per file type

后端 未结 2 374

All:

I want to use kdiff to merge all files with a certain suffix (say *.c, *.h) and I want to do two things (turn off premerge and use internal:other) for all files

2条回答
  •  余生分开走
    2021-01-20 11:19

    According to this Mercurial MergeToolConfiguration page, you should put the interal:other directly after the match pattern:

    [merge-patterns]
    **.mdl = internal:other
    

提交回复
热议问题