Mercurial > hg > easyhg-kdiff3

changeset 41:311175668b79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bugfix for Syncmode.
author joachim99
date Tue, 14 Oct 2003 20:51:45 +0000
parents b19cb8e5c569
children f8290ffda5ca
files kdiff3/src/directorymergewindow.h
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/kdiff3/src/directorymergewindow.h	Tue Oct 14 20:50:46 2003 +0000
+++ b/kdiff3/src/directorymergewindow.h	Tue Oct 14 20:51:45 2003 +0000
@@ -17,6 +17,9 @@
 
 /***************************************************************************
  * $Log$
+ * Revision 1.2  2003/10/14 20:51:45  joachim99
+ * Bugfix for Syncmode.
+ *
  * Revision 1.1  2003/10/06 18:38:48  joachim99
  * KDiff3 version 0.9.70
  *                                                                   *
@@ -176,11 +179,11 @@
    void compareFilesAndCalcAges( MergeFileInfos& mfi );
 
    QString fullNameA( const MergeFileInfos& mfi )
-   { return mfi.m_fileInfoA.absFilePath(); }
+   { return m_dirA.absFilePath() + "/" + mfi.m_subPath; }
    QString fullNameB( const MergeFileInfos& mfi )
-   { return mfi.m_fileInfoB.absFilePath(); }
+   { return m_dirB.absFilePath() + "/" + mfi.m_subPath; }
    QString fullNameC( const MergeFileInfos& mfi )
-   { return mfi.m_fileInfoC.absFilePath(); }
+   { return m_dirC.absFilePath() + "/" + mfi.m_subPath; }
    QString fullNameDest( const MergeFileInfos& mfi )
    { return m_dirDestInternal.absFilePath() + "/" + mfi.m_subPath; }