Merge pull request #2226 from dariusz-wozniak/patch-2

StanleyGoldman · web-flow · commit a661e7d7d0b1 · 2019-04-16T10:44:43.000-04:00
Add KDiff3 section
diff --git a/.gitignore b/.gitignore
@@ -239,6 +239,13 @@ coverage.xml
 #Msbuild binary log output
 output.binlog
 
+# KDiff3
+*_BACKUP_*
+*_BASE_*
+*_LOCAL_*
+*_REMOTE_*
+*.orig
+
 AkavacheSqliteLinkerOverride.cs
 NuGetBuild
 WiX.Toolset.DummyFile.txt
