Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(121)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: .gitignore

Issue 4823005: Merge remote branch 'cros/upstream' into tempbranch (Closed) Base URL: http://git.chromium.org/git/autotest.git@master
Patch Set: patch Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | cli/cli_mock.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: .gitignore
diff --git a/.gitignore b/.gitignore
index 51dad37c9010bfab55e8ffe5625f9545abb582e3..355a9e31ca9e61e3d1d6d84a7af7760d25ab5eb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,18 @@ tmp/
# This file is meant only for local testing
private_host_attributes_config.py
+
+# default svn:ignore property:
+.*.rej
+*.rej
+.*~
+*~
+.#*
+.DS_Store.
+# additional patterns:
+client/control
+client/results/
+client/tests/kvm/images
+client/tests/kvm/env
+client/tmp
+client/tests/kvm/*.cfg
« no previous file with comments | « no previous file | cli/cli_mock.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698