Merge branch 'master' of https://github.com/winmerge/winmerge into jp

[winmerge-jp/winmerge-jp.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index b998118..74bea9b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 
 **/.vs
 **/ipch
-
 **/BuildTmp
 **/Build
 **/obj64
@@ -12,6 +11,8 @@
 **/Release
 **/x64Debug
 **/Debug
+**/Unicode Debug
+**/Unicode Release
 winmerge-cppcheck-build-dir/
 
 *.exe
@@ -36,6 +37,8 @@ winmerge-cppcheck-build-dir/
 *.pch
 *.idb
 *.log
+*.diagsession
+*.asm
 
 Testing/Data/ShellFileOpTest/File1.txt
 Translations/WinMerge/MergeLang.lastbuild