Mercurial > hg > easyhg
comparison changesetscene.h @ 153:70fe12873106
* Show both parents of uncommitted merge; fixes to right-button menus
author | Chris Cannam |
---|---|
date | Thu, 02 Dec 2010 17:55:21 +0000 |
parents | 2fef6b0dfbe8 |
children | 4bad3c5c053a |
comparison
equal
deleted
inserted
replaced
152:2b997861174b | 153:70fe12873106 |
---|---|
35 | 35 |
36 signals: | 36 signals: |
37 void commit(); | 37 void commit(); |
38 void revert(); | 38 void revert(); |
39 void diffWorkingFolder(); | 39 void diffWorkingFolder(); |
40 void showWork(); | |
40 | 41 |
41 void updateTo(QString id); | 42 void updateTo(QString id); |
42 void diffToParent(QString id, QString parent); | 43 void diffToParent(QString id, QString parent); |
43 void diffToCurrent(QString id); | 44 void diffToCurrent(QString id); |
44 void mergeFrom(QString id); | 45 void mergeFrom(QString id); |