Commit eb8e5a73 authored by Joachim Eibl's avatar Joachim Eibl

Added default directory anti patterns ".hg" and ".git" and file anti patterns...

Added default directory anti patterns ".hg" and ".git" and file anti patterns ".rej" and ".bak" for better mercurial and git integration.
(Idea by Angel Ezquerra)

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@162 c8aa9fed-2811-0410-8543-893ada326672
parent 36df9814
......@@ -11,6 +11,7 @@
- Documentation patch (by Burkard Lück)
- Select text in Find dialog (by Eike Sauer)
- If text is selected in either input or output window use that in Find dialog.
- Added default directory anti patterns ".hg" and ".git" and file anti patterns ".rej" and ".bak" for better mercurial and git integration.
Version 0.9.96 - 2011-09-02
===========================
......
......@@ -1089,7 +1089,7 @@ void OptionDialog::setupDirectoryMergePage( void )
label = new QLabel( i18n("File-anti-pattern(s):"), page );
gbox->addWidget( label, line, 0 );
OptionLineEdit* pFileAntiPattern = new OptionLineEdit( "*.orig;*.o;*.obj", "FileAntiPattern", &m_options.m_DmFileAntiPattern, page, this );
OptionLineEdit* pFileAntiPattern = new OptionLineEdit( "*.orig;*.o;*.obj;*.rej;*.bak", "FileAntiPattern", &m_options.m_DmFileAntiPattern, page, this );
gbox->addWidget( pFileAntiPattern, line, 1 );
label->setToolTip( i18n(
"Pattern(s) of files to be excluded from analysis. \n"
......@@ -1100,7 +1100,7 @@ void OptionDialog::setupDirectoryMergePage( void )
label = new QLabel( i18n("Dir-anti-pattern(s):"), page );
gbox->addWidget( label, line, 0 );
OptionLineEdit* pDirAntiPattern = new OptionLineEdit( "CVS;.deps;.svn", "DirAntiPattern", &m_options.m_DmDirAntiPattern, page, this );
OptionLineEdit* pDirAntiPattern = new OptionLineEdit( "CVS;.deps;.svn;.hg;.git", "DirAntiPattern", &m_options.m_DmDirAntiPattern, page, this );
gbox->addWidget( pDirAntiPattern, line, 1 );
label->setToolTip( i18n(
"Pattern(s) of directories to be excluded from analysis. \n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment