LimeSurvey/LimeSurvey — comment on commit 127b7251510e0275b0a42487ef2f043603b2da1b
File:  line 0
By c-schmitz:

No history, sorry. I did the merge the old way because there were too
many conflicts (almost every file had a conflict) when trying to merge
it using Git.

Am 02.03.2012 22:26, schrieb Thomas White:
> OK.
>
> Should we be able to see history for files that have been merged in? I don't see any history prior to the merge you just did.
>
> ---
> Reply to this email directly or view it on GitHub:
> https://github.com/LimeSurvey/LimeSurvey/commit/127b7251510e0275b0a42487ef2f043603b2da1b#commitcomment-1037443