Mercurial > hg > easyhg-kdiff3

comparison kdiff3/src/merger.cpp @ 58:8af4bb9d9a5a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Version 0.9.83
author joachim99
date Sun, 07 Mar 2004 09:59:09 +0000
parents c59d5a3a8ff3
children 8febbfb1148c
comparison
equal deleted inserted replaced
57:023fbd76c1e3 58:8af4bb9d9a5a
1 /*************************************************************************** 1 /***************************************************************************
2 merger.cpp - description 2 merger.cpp - description
3 ------------------- 3 -------------------
4 begin : Sun Mar 24 2002 4 begin : Sun Mar 24 2002
5 copyright : (C) 2002 by Joachim Eibl 5 copyright : (C) 2002-2004 by Joachim Eibl
6 email : joachim.eibl@gmx.de 6 email : joachim.eibl@gmx.de
7 ***************************************************************************/ 7 ***************************************************************************/
8 8
9 /*************************************************************************** 9 /***************************************************************************
10 * * 10 * *