Added git alias to list only conflicted files#1733

NoahGorny merged 2 commits intoBash-it:masterBash-it/bash-it:masterfrom

tbhaxor:patch-1tbhaxor/bash-it:patch-1Copy head branch name to clipboard