differentiating between edge diffs and regular edge files, refs #2

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@15411 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
fixing svn properties

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@15412 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
Merge branch 'master' into planet