Mercurial > hg > mercurial-crew-with-dirclash
log
age | author | description |
---|---|---|
Thu, 04 Aug 2005 17:23:31 +0100 | Thomas Arendsen Hein | If rejects are empty after using the editor, merge with diff+patch was ok. |
Thu, 04 Aug 2005 17:16:41 +0100 | Thomas Arendsen Hein | Shortened hgmerge a little bit. |