Add p4merge to the list of difftools
Fixed undetected working directory in root directory (the additional "dir.rfind" in the while condition stopped the loop *before* e.g. "C:" has been reached)
Fixed performance issue when executing IsValidGitDir on an UNC path (now we stop when reaching the root directory (provided by PathIsRoot), like "\\server\share")
Merge pull request #2306 from ulrichb/IsValidGitDir_UNC_path_bug

Shell Extensions: IsValidGitDir UNC path performance bug fix (resolves #2250)
Merge pull request #2227 from stwalkerster/master

Add p4merge to the list of difftools
Merge pull request #2346 from gitextensions/release/2.47

Shell Extensions: IsValidGitDir UNC path performance bug fix
Include JavaScript files as 'code' files.

When counting code files, JavaScript (*.js) files are not included, yet other web-types such as CSS and HTML are.
Merge pull request #2347 from simbolo/patch-1

Include JavaScript files as 'code' files.