Mercurial > hg-website
comparison hgscm/templates/workflow_guide.html @ 241:4f77a5b15057
Added note: Resolve on Ubuntu needs kdiff3 or similar - systemwide config.
| author | Arne Babenhauserheide <bab@draketo.de> |
|---|---|
| date | Mon, 28 Sep 2009 13:03:39 +0200 |
| parents | ee2c1a02c693 |
| children | 300380748253 |
comparison
equal
deleted
inserted
replaced
| 240:85a7a53db1a5 | 241:4f77a5b15057 |
|---|---|
| 221 | 221 |
| 222 <pre>$ hg resolve conflicting_file | 222 <pre>$ hg resolve conflicting_file |
| 223 (fix it by hand, if necessary) | 223 (fix it by hand, if necessary) |
| 224 | 224 |
| 225 </pre> | 225 </pre> |
| 226 | |
| 227 <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> | |
| 226 | 228 |
| 227 <p>Mark the fixed file as resolved</p> | 229 <p>Mark the fixed file as resolved</p> |
| 228 | 230 |
| 229 <pre>$ hg resolve --mark conflicting_file | 231 <pre>$ hg resolve --mark conflicting_file |
| 230 | 232 |