Add a simple conflict helper
[msysgit.git] / doc / git / 
treeadba1a0f7cb7bb88828aa6aa17596cedb8454f62
drwxr-xr-x   ..
m--------- - html