comparison changesetscene.cpp @ 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
59 connect(item, SIGNAL(revert()), 59 connect(item, SIGNAL(revert()),
60 this, SIGNAL(revert())); 60 this, SIGNAL(revert()));
61 61
62 connect(item, SIGNAL(diff()), 62 connect(item, SIGNAL(diff()),
63 this, SIGNAL(diffWorkingFolder())); 63 this, SIGNAL(diffWorkingFolder()));
64
65 connect(item, SIGNAL(showWork()),
66 this, SIGNAL(showWork()));
64 } 67 }
65 68
66 void 69 void
67 ChangesetScene::changesetDetailShown() 70 ChangesetScene::changesetDetailShown()
68 { 71 {