Fix detection of (missing) diffmerge.exe
Ignore changes to directories (don't ignore add/remove/renamed directories). Ignore all *.lock files under a .git folder. Don't ignore anything else.