Thu, 05 Apr 2007 16:43:18 -0500 | Matt Mackall | merge: fix a bug where copies were ignored | file | diff | annotate |
Mon, 11 Dec 2006 18:09:52 +0100 | Thomas Arendsen Hein | Add instructions how to redo/finish failed merge with local working directory. | file | diff | annotate |