Change 5534
Sam Stafford
committed this change
into
//guest/sam_stafford/calamari
Request Review
Download .zip
A brand new help file, a bit of cosmetic sprucing, one critical bug
fix, and a partridge in a pear tree.
Files
24
Comments
0
10
edited
14
added
0
deleted
•
BaseWidget.h#5
Loading...
CalamariWindow.cpp#12
Loading...
CalamariWindow.h#9
Loading...
ColorOptsDialog.cpp#3
Loading...
ColorOptsDialog.h#2
Loading...
MergeEditor.cpp#5
Loading...
MergeEditor.h#4
Loading...
MergeWidget.cpp#6
Loading...
MergeWidget.h#6
Loading...
calamari.png#1
Loading...
calamari.vcproj#12
Loading...
help/base.png#1
Loading...
help/diff-how.png#1
Loading...
help/diff-toolbar.png#1
Loading...
help/diff-window.png#1
Loading...
help/diffing.html#1
Loading...
help/main.html#1
Loading...
help/merge-how.png#1
Loading...
help/merge-toolbar.png#1
Loading...
help/merge-window.png#1
Loading...
help/merging.html#1
Loading...
help/result.png#1
Loading...
help/theirs.png#1
Loading...
help/yours.png#1
Loading...
Tip: Use
n
and
p
to cycle through the changes.