diff --git a/README.md b/README.md
index 3152b08..18e5368 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ In that case, you are in the right place!
 
 ## Dependencies
 
-* POSIX compatible shell (e.g. [Dash](http://gondor.apana.org.au/~herbert/dash/), [Bash](https://www.gnu.org/software/bash/))
+* POSIX compatible shell (e.g. [Dash](http://gondor.apana.org.au/~herbert/dash/), [Bash](https://www.gnu.org/software/bash/), KornShell, [Git Bash for Windows](https://gitforwindows.org/))
 * [Git](https://git-scm.com/)
 * [Vim](https://www.vim.org/) _(optional)_ - for config-less filetype detection
 * a formatter program of your choice
diff --git a/git-fmt-diff b/git-fmt-diff
index 0139cc8..4c805b4 100755
--- a/git-fmt-diff
+++ b/git-fmt-diff
@@ -311,8 +311,8 @@ git_diff () (
     # shellcheck disable=SC2086
     git diff $color "$b_raw" "$chng_fmt" | \
         sed \
-            -e "s/$(sed_esc -p "a$b_raw")/$(sed_esc -s a/"$filename")/g" \
-            -e "s/$(sed_esc -p "b$chng_fmt")/$(sed_esc -s b/"$filename")/g"
+            -e "s/a\/*$(sed_esc -p "$b_raw")/$(sed_esc -s a/"$filename")/g" \
+            -e "s/b\/*$(sed_esc -p "$chng_fmt")/$(sed_esc -s b/"$filename")/g"
 )
 
 git_retrieve_file_from_sha () (
@@ -576,6 +576,8 @@ g_rm_list="$(mktemp)"
 rm_list__push "$TMPDIR"
 rm_list__push "$g_rm_list"
 
+pwd -W > /dev/null 2>&1 && TMPDIR="$(cd "$TMPDIR" && pwd -W)"
+
 trap 'cleanup' EXIT
 # }}}2