From 7b238ea473fd74b9ddcf4c61330aacf5fe788ca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dariusz=20Wo=C5=BAniak?= Date: Tue, 12 Feb 2019 21:13:17 +0100 Subject: [PATCH 1/3] Add KDiff3 section --- VisualStudio.gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index 953996b9..51559244 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -340,3 +340,10 @@ ASALocalRun/ # BeatPulse healthcheck temp database healthchecksdb + +# KDiff3 +*_BACKUP_* +*_BASE_* +*_LOCAL_* +*_REMOTE_* +*.orig From 8da10e070cf102e46f75e2e3f7d39f5ec635a874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dariusz=20Wo=C5=BAniak?= Date: Sat, 9 Mar 2019 15:39:29 +0100 Subject: [PATCH 2/3] Revert "Add KDiff3 section" This reverts commit 7b238ea473fd74b9ddcf4c61330aacf5fe788ca8. --- VisualStudio.gitignore | 7 ------- 1 file changed, 7 deletions(-) diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index 51559244..953996b9 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -340,10 +340,3 @@ ASALocalRun/ # BeatPulse healthcheck temp database healthchecksdb - -# KDiff3 -*_BACKUP_* -*_BASE_* -*_LOCAL_* -*_REMOTE_* -*.orig From afbaeb85f6c349fda6d09dfc03afe6411958b2bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dariusz=20Wo=C5=BAniak?= Date: Sat, 9 Mar 2019 15:42:23 +0100 Subject: [PATCH 3/3] Add KDiff3 gitignore file --- KDiff3.gitignore | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 KDiff3.gitignore diff --git a/KDiff3.gitignore b/KDiff3.gitignore new file mode 100644 index 00000000..3aa40d91 --- /dev/null +++ b/KDiff3.gitignore @@ -0,0 +1,9 @@ +*.BACKUP.* +*_BACKUP_* +*.BASE.* +*_BASE_* +*.LOCAL.* +*_LOCAL_* +*.REMOTE.* +*_REMOTE_* +*.orig \ No newline at end of file