#include "MergeWidget.h" MergeWidget::MergeWidget( char* base, char* theirs, char* yours ) :BaseWidget( theirs, yours ) { } MergeWidget::~MergeWidget(void) { }
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#8 | 5549 | Sam Stafford |
Fix another edge case bug where Qt's behavior is the opposite of what I'd expect - when an empty clip region is set, the clip region is cleared entirely, as if a FULL clip region had been set. The resulting bug was that any image which had zero conflicts would show up as one gigantic conflict - ack! The code now checks for this case and bails out of any painting operation that's about to use an empty clip region. |
||
#7 | 5539 | Sam Stafford | Kick off another window to merge alpha channels, if present. | ||
#6 | 5534 | Sam Stafford |
A brand new help file, a bit of cosmetic sprucing, one critical bug fix, and a partridge in a pear tree. |
||
#5 | 5527 | Sam Stafford |
Diff options in merge mode, and an "export stencils" command for people who like that sort of thing. Also, a fresh build. |
||
#4 | 5524 | Sam Stafford | Eraser and spraypaint tools, and "Save" command. | ||
#3 | 5519 | Sam Stafford |
Added the paintbrush tool. Now we're getting somewhere. |
||
#2 | 5516 | Sam Stafford | The M is for Merge. | ||
#1 | 5511 | Sam Stafford | Continued infrastructure work. |