Mercurial > hg-website
changeset 263:70683e92aacb
Merge http://bitbucket.org/segv/hg-website
| author | David Soria Parra <dsp@php.net> |
|---|---|
| date | Fri, 16 Oct 2009 00:19:03 +0200 |
| parents | 4e1710cdae18 (current diff) fdb616b63365 (diff) |
| children | e497fd754aa0 |
| files | original/hgscm/templates/workflow_guide.html |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/original/hgscm/templates/workflow_guide.html Fri Oct 16 00:17:17 2009 +0200 +++ b/original/hgscm/templates/workflow_guide.html Fri Oct 16 00:19:03 2009 +0200 @@ -224,6 +224,8 @@ </pre> +<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 @@ -352,7 +354,7 @@ </pre> -<p>Now all others can point their browsers to his IP address (for example 192.168.178.100) at port 8000. They will then see all his history there and can sdecide if they want to pull his changes.</p> +<p>Now all others can point their browsers to his IP address (for example 192.168.178.100) at port 8000. They will then see all his history there and can decide if they want to pull his changes.</p> <pre>$ firefox http://192.168.178.100:8000 @@ -760,7 +762,7 @@ <p>If you now want to check some more complex workflows, please have a look at the general <a title="Mercurial Workflows" href="http://selenic.com/mercurial/wiki/Workflows">workflows wikipage</a>.</p> -<p>To deepen your understanding, you should also check the <a title="Overview of the basic concepts of Mercurial" href="quick_start_concepts">basic concept overview</a>.</p> +<p>To deepen your understanding, you should also check the <a title="Overview of the basic concepts of Mercurial" href="quick-start">basic concept overview</a>.</p> <p>Have fun with Mercurial!</p>