Merge branch 'master' of github.com:so-fancy/diff-so-fancy into next

scottchiefbaker · scottchiefbaker · commit 347fe1675c57 · 2017-07-17T09:02:06.000-07:00
diff --git a/diff-so-fancy b/diff-so-fancy
@@ -718,4 +718,4 @@ sub color {
 	return $ret;
 }
 
-# vim: tabstop=4 shiftwidth=4 autoindent softtabstop=4
+# vim: tabstop=4 shiftwidth=4 noexpandtab autoindent softtabstop=4

Original file line number	Diff line number	Diff line change
`@@ -718,4 +718,4 @@ sub color {`
`718`	`718`	`return $ret;`
`719`	`719`	`}`
`720`	`720`
`721`		`-# vim: tabstop=4 shiftwidth=4 autoindent softtabstop=4`
	`721`	`+# vim: tabstop=4 shiftwidth=4 noexpandtab autoindent softtabstop=4`