Merge branch 'feat1' into master

79d02615 · Stefan Tauner · a67c9dde · 141daa02 · 79d02615 · 79d02615
Commit 79d02615 authored Oct 19, 2016 by Stefan Tauner
--- a/dir1/increment
+++ b/dir1/increment
+2nd
+3
+4
--- a/dir1/subdir/foofile
+++ b/dir1/subdir/foofile
+foo
--- a/dir2/foofile
+++ b/dir2/foofile
+foo
--- a/firstfile
+++ b/firstfile
 first change
 second change
+foo