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

14 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
  5. These people paid attention to me in addition to the agency apps to work within my spending budget. I discovered all of them and decided to give them an opportunity.

    ReplyDelete
  6. The project ran into occasional obstacles, but the team’s diligence and expertise made for an overall positive collaboration.
    top app design services

    ReplyDelete
  7. Client satisfaction is something that they really value. It’s not just something they give lip service to
    brand design firm

    ReplyDelete
  8. They deliver excellent communications and inexpensive yet high-quality work.
    digital branding companies

    ReplyDelete
  9. These are truly amongst the wonderful informative blogs.
    UI UX designer

    ReplyDelete
  10. I want more and more articles and blogs please post soon such informative information.
    UX agency

    ReplyDelete
  11. I was pinning away for such type of blogs, thanks for posting this for us.
    logo creator company

    ReplyDelete
  12. Hello, this is fastidious post I actually loved reading this.
    best logo design services

    ReplyDelete
  13. I see the greatest contents on your blog and I extremely love reading them.
    creative web design agency

    ReplyDelete
  14. The quality of your blogs and conjointly the articles and price appreciating.
    best web design firm

    ReplyDelete