Move shell code into their own script files
Only show conflicting files if inside a merge
Do not show any files if working tree is clean