Mercurial > hg > easyhg-kdiff3

comparison kdiff3/src/merger.cpp @ 69:8febbfb1148c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
KDiff3 0.9.89
author joachim99
date Mon, 10 Apr 2006 08:40:51 +0000
parents 8af4bb9d9a5a
children
comparison
equal deleted inserted replaced
68:d7cafcda8c99 69:8febbfb1148c
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-2004 by Joachim Eibl 5 copyright : (C) 2002-2004 by Joachim Eibl
6 email : joachim.eibl@gmx.de 6 email : joachim.eibl at gmx.de
7 ***************************************************************************/ 7 ***************************************************************************/
8 8
9 /*************************************************************************** 9 /***************************************************************************
10 * * 10 * *
11 * This program is free software; you can redistribute it and/or modify * 11 * This program is free software; you can redistribute it and/or modify *