Change 5516
Sam Stafford
committed this change
into
//guest/sam_stafford/calamari
Request Review
Download .zip
The M is for Merge.
Files
18
Comments
0
12
edited
6
added
0
deleted
•
BaseWidget.h#4
Loading...
CalamariWindow.cpp#7
Loading...
CalamariWindow.h#5
Loading...
DiffWidget.cpp#7
Loading...
ImageProjector.cpp#4
Loading...
ImageProjector.h#4
Loading...
MergeEditor.cpp#1
Loading...
MergeEditor.h#1
Loading...
MergeWidget.cpp#2
Loading...
MergeWidget.h#2
Loading...
Minimap.cpp#2
Loading...
Minimap.h#2
Loading...
auto.png#1
Loading...
calamari.vcproj#7
Loading...
conflict.png#1
Loading...
icons.qrc#2
Loading...
theirs.png#1
Loading...
yours.png#1
Loading...
Tip: Use
n
and
p
to cycle through the changes.
