t / t5515 / fetch.br-branches-one-merge_branches-oneon commit conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts (2adc7dc)
   1# br-branches-one-merge branches-one
   28e32a6d901327a23ef831511badce7bf3bf46689        not-for-merge   branch 'one' of ../
   30567da4d5edd2ff4bb292a465ba9e64dcad9536b                branch 'three' of ../
   4754b754407bf032e9a2f9d5a9ad05ca79a6b228f        not-for-merge   tag 'tag-master' of ../
   58e32a6d901327a23ef831511badce7bf3bf46689        not-for-merge   tag 'tag-one' of ../
   622feea448b023a2d864ef94b013735af34d238ba        not-for-merge   tag 'tag-one-tree' of ../
   70567da4d5edd2ff4bb292a465ba9e64dcad9536b        not-for-merge   tag 'tag-three' of ../
   80e3b14047d3ee365f4f2a1b673db059c3972589c        not-for-merge   tag 'tag-three-file' of ../
   96134ee8f857693b96ff1cc98d3e2fd62b199e5a8        not-for-merge   tag 'tag-two' of ../