Relocated get_git_dir logic to function, enabled merge in progress test, and everything looks good
Relocated get_git_dir logic to function, enabled merge in progress test, and everything looks good

juanplopes/sexy-bash-prompt,saltatory/sexy-bash-prompt,duythien/sexy-bash-prompt,twolfson/sexy-bash-prompt,SCdF/sexy-bash-prompt