Conflict is a project mainly written in ..., it's free.
test git conflict error codes
WTHIS FILE IS SOO BROKENHAT IS GOING ON IN THIS GIT REPO?
d2fb6e99052ee7241f6979a58c4783bf030f70ba Barbara 2e9b6b258ca2f1b425f2584ef1646f51bb0e30a0
Barbara 2e9b6b258ca2f1b425f2584ef1646f51bb0e30a0