Add a simple conflict helper
[msysgit/kusma.git] / share / 
tree9679770255c12d5d6d2652d7463d5412a5cbd2d2
drwxr-xr-x   ..
drwxr-xr-x - 7-Zip
drwxr-xr-x - InnoSetup
drwxr-xr-x - WinGit
drwxr-xr-x - locale
drwxr-xr-x - msysGit
drwxr-xr-x - resources
drwxr-xr-x - vim