2010/09/30

Avoid mercurial auto merge

Just put this in mercurial.ini :

[ui]
merge=kdiff3

[merge-tools]
kdiff3.premerge=false
kdiff3.args=--L1 base --L2 local --L3 other $base $local $other -o $output

4 comments:

  1. Way to them for making that possible web designers websites! They are counseled to all.

    ReplyDelete
  2. Their high-quality deliverables why web design will likely lead to a continued engagement.

    ReplyDelete
  3. The team’s communication skills were lacking, and their ability to meet deadlines fell short. Costs were unreasonable given the end result.
    logo creation companies

    ReplyDelete
  4. Their structured professionalism made the whole project easy and enjoyable.
    brand management agency

    ReplyDelete