Mercurial > hg > easyhg
log mainwindow.cpp @ 237:c9a7e4ec2f78
age | author | description |
---|---|---|
Mon, 10 Jan 2011 12:44:03 +0000 | Chris Cannam | * Try to do the right thing when completely reverting a merge (forget that the merge took place) |
Fri, 07 Jan 2011 21:58:38 +0000 | Chris Cannam | * Better handling for case where we've just created a new branch but not yet committed it (i.e. no heads are on our current branch) |
Thu, 06 Jan 2011 15:15:02 +0000 | Chris Cannam | * Add settings for text verboseness and toolbar labels |
Thu, 06 Jan 2011 13:16:34 +0000 | Chris Cannam | * Add version number to About box |
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) |