diff options
| author | Machiavelli <machiavelli.trinity@gmail.com> | 2012-01-15 15:28:52 +0100 |
|---|---|---|
| committer | Machiavelli <machiavelli.trinity@gmail.com> | 2012-01-15 15:28:52 +0100 |
| commit | f71ad6d581cac33468693f6978e9528c349cbd11 (patch) | |
| tree | bbc154f5f29d8de3d193c9e04f24eeaeac8af8b9 | |
| parent | b02666213c4c69bb0ea1a237e746f994284184ec (diff) | |
DVCS: Add kdiff3 file extensions to gitignore
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 5 insertions, 0 deletions
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 |