Commits

Rufus Pollock committed 0de3e05

[doc][xs]: add link about octopus merges.

Comments (0)

Files changed (1)

doc/changeset.rst

   * http://mercurial.selenic.com/wiki/UnderstandingMercurial
   * http://hgbook.red-bean.com/read/behind-the-scenes.html
   * (Longer) http://mercurial.selenic.com/wiki/Mercurial?action=AttachFile&do=get&target=Hague2009.pdf
+  * Octopus merges: http://arrenbrecht.ch/mercurial/pbranch/octopus.htm
 
 Key concepts: