Mention -m as an abbreviation for --merge

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 20ee642420a82d71a5ed7df6194de87f436bc6de..63c918c667fa005ff12ad89437f2fdc80926e21c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -148,6 +148,7 @@ git-write-tree
 git-core-*/?*
 gitk-wish
 gitweb/gitweb.cgi
+test-absolute-path
 test-chmtime
 test-date
 test-delta