Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add merge tool bit to gitignore

This commit is contained in:
Jesse McConnell 2011-10-24 10:56:31 -05:00
parent cd0628ab66
commit ae16ccd918
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -31,3 +31,6 @@ target/
# vim # vim
.*.sw[a-p] .*.sw[a-p]
# merge tooling
*.orig