From f71ad6d581cac33468693f6978e9528c349cbd11 Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Sun, 15 Jan 2012 15:28:52 +0100 Subject: DVCS: Add kdiff3 file extensions to gitignore --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 5bceef179b9..ace64225d0c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ + build*/ .directory .mailmap @@ -9,3 +10,7 @@ build*/ *.bak *.patch *.diff +*.REMOTE.* +*.BACKUP.* +*.BASE.* +*.LOCAL.* \ No newline at end of file -- cgit v1.2.3