diff options
Diffstat (limited to 'src/diff.h')
-rw-r--r-- | src/diff.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -169,10 +169,10 @@ public: typedef std::vector<Diff3WrapLine> Diff3WrapLineVector; -class TotalDifftqStatus +class TotalDiffStatus { public: - TotalDifftqStatus(){ reset(); } + TotalDiffStatus(){ reset(); } void reset() {bBinaryAEqC=false; bBinaryBEqC=false; bBinaryAEqB=false; bTextAEqC=false; bTextBEqC=false; bTextAEqB=false; nofUnsolvedConflicts=0; nofSolvedConflicts=0; |