Index: fish/functions/fld.fish
==================================================================
--- fish/functions/fld.fish
+++ fish/functions/fld.fish
@@ -1,3 +1,11 @@
 function fld --wraps 'fossil diff'
-    command fossil diff $argv -N | colordiff | less -FRX
+    if type -q colordiff2
+        command fossil diff -N $argv | colordiff | less -FRX
+    else
+        set -l red (tput setaf 1)
+        set -l green (tput setaf 2)
+        set -l reset (tput sgr0)
+        fossil diff -N $argv | sed "s/^+.*\$/$green&$reset/" |
+            sed "s/^-.*\$/$red&$reset/" | less -FRX
+    end
 end

Index: git/config
==================================================================
--- git/config
+++ git/config
@@ -33,5 +33,7 @@
 	insteadOf = https://github.com/
 	pushInsteadOf = https://github.com/
 
 [fetch]
 	fsckObjects = true
+[pull]
+	ff = only