Mercurial > hg > easyhg
log mainwindow.cpp @ 228:b286f26561c9
age | author | description |
---|---|---|
Thu, 06 Jan 2011 12:22:56 +0000 | Chris Cannam | * Restore a change that got lost in the merge. I think I need to review the external merge tool mechanism here |
Thu, 06 Jan 2011 12:07:06 +0000 | Chris Cannam | Merge |
Thu, 06 Jan 2011 11:52:23 +0000 | Chris Cannam | * Properly handle the case where the working copy is empty but the repo is not (e.g. just after convert) |