Mercurial > hg > easyhg-kdiff3
diff kdiff3/src/merger.cpp @ 69:8febbfb1148c
KDiff3 0.9.89
author | joachim99 |
---|---|
date | Mon, 10 Apr 2006 08:40:51 +0000 |
parents | 8af4bb9d9a5a |
children |
line wrap: on
line diff
--- a/kdiff3/src/merger.cpp Mon Jan 31 22:30:47 2005 +0000 +++ b/kdiff3/src/merger.cpp Mon Apr 10 08:40:51 2006 +0000 @@ -3,7 +3,7 @@ ------------------- begin : Sun Mar 24 2002 copyright : (C) 2002-2004 by Joachim Eibl - email : joachim.eibl@gmx.de + email : joachim.eibl at gmx.de ***************************************************************************/ /***************************************************************************