Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/hg.py @ 3869:ad6f34c83c3d
age | author | description |
---|---|---|
Mon, 11 Dec 2006 18:09:52 +0100 | Thomas Arendsen Hein | Add instructions how to redo/finish failed merge with local working directory. |
Sun, 10 Dec 2006 02:11:02 -0600 | Matt Mackall | Merge Benoit's .hg/store support |