Fix merge error if there are two files with the same name#15
Open
tschoartschi wants to merge 2 commits intotomasbasham:masterfrom
Open
Fix merge error if there are two files with the same name#15tschoartschi wants to merge 2 commits intotomasbasham:masterfrom
tschoartschi wants to merge 2 commits intotomasbasham:masterfrom