1. David Soria Parra
  2. hg-website


Arne Babenhauserheide  committed 4f77a5b

Added note: Resolve on Ubuntu needs kdiff3 or similar - systemwide config.

  • Participants
  • Parent commits 85a7a53
  • Branches default

Comments (0)

Files changed (1)

File hgscm/templates/workflow_guide.html

View file
+<p>Note: If you use Ubuntu and resolve doesn't work, you can either look into <em>/etc/mercurial/hgrc.d/extdiff.rc</em>, or install kdiff3 or some other tool listed in that file.</p> 
 <p>Mark the fixed file as resolved</p>
 <pre>$ hg resolve --mark conflicting_file