test to verify the fast forwarded sentence ...
commit created 3 on master ...
commit created 3 on post-master ...
added conflicts 4 ...
added conflicts 4 on master...
commit is resolved over here ...
added of commit that will be resolved by commit tools ...
this is a merge that must be resolved by mergetools ....
conflict resolved from merge tools .....