From 62a3152e80bac52c3262bdc62e8061504940ddb5 Mon Sep 17 00:00:00 2001 From: Eric Cousineau Date: Mon, 9 Oct 2017 17:21:06 -0400 Subject: [PATCH] Move mesh file gitattributes to root level. --- .gitattributes | 6 ++++++ drake/perception/estimators/dev/test/.gitattributes | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 drake/perception/estimators/dev/test/.gitattributes diff --git a/.gitattributes b/.gitattributes index 817e5f058268..262714406160 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,3 +5,9 @@ **/BUILD.bazel diff=python WORKSPACE diff=python **/*.cps diff=json + +# These lines tell git diff viewers to ignore data objects. +# Wavefront geometry definition +*.obj -diff +# VTK polygon data +*.vtp -diff diff --git a/drake/perception/estimators/dev/test/.gitattributes b/drake/perception/estimators/dev/test/.gitattributes deleted file mode 100644 index f7b2618705aa..000000000000 --- a/drake/perception/estimators/dev/test/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -*.obj -diff -*.vtp -diff