From c7e29c4606e72cf1d3d0052eec08805c8cf3fce7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:09:35 -0600 Subject: Rename old tq methods that no longer need a unique name --- src/diff.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/diff.h') diff --git a/src/diff.h b/src/diff.h index ee3076e..a4015d1 100644 --- a/src/diff.h +++ b/src/diff.h @@ -169,10 +169,10 @@ public: typedef std::vector 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; -- cgit v1.2.3