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

Author: scottchiefbaker

diff-so-fancy

@@ -608,8 +608,8 @@ sub usage {
 	$out .= "Usage:
 
 git diff --color | diff-so-fancy # Use d-s-f on one diff
-git diff --colors                # View the commands to set the recommended colors
-git diff --set-defaults          # Configure git-diff to use diff-so-fancy and suggested colors
+diff-so-fancy --colors           # View the commands to set the recommended colors
+diff-so-fancy --set-defaults     # Configure git-diff to use diff-so-fancy and suggested colors
 
 # Configure git to use d-s-f for *all* diff operations
 git config --global core.pager \"diff-so-fancy | less --tabs=4 -RFX\"\n";

third_party/build_fatpack/diff-so-fancy

@@ -837,8 +837,8 @@ sub usage {
 	$out .= "Usage:
 
 git diff --color | diff-so-fancy # Use d-s-f on one diff
-git diff --colors                # View the commands to set the recommended colors
-git diff --set-defaults          # Configure git-diff to use diff-so-fancy and suggested colors
+diff-so-fancy --colors           # View the commands to set the recommended colors
+diff-so-fancy --set-defaults     # Configure git-diff to use diff-so-fancy and suggested colors
 
 # Configure git to use d-s-f for *all* diff operations
 git config --global core.pager \"diff-so-fancy | less --tabs=4 -RFX\"\n";