Commits

Oleg Oshmyan committed 73f18d6

Add a note about Mercurial's new standard shelve extension

Comments (0)

Files changed (1)

 
 For more information please visit the `hgshelve website`_.
 
-.. _hgshelve website: http://mercurial.selenic.com/wiki/ShelveExtension
+.. _hgshelve website: http://mercurial.selenic.com/wiki/ThirdPartyShelveExtension
+
+Starting from version 2.8, Mercurial includes its own shelve extension,
+which operates differently (more like Git's stash command) and supports
+conflict resolution during unshelving. Consider using that.
 
 
 Developer Info