Stupid Git tricks: Combining two files into one while preserving line historydevblogs.microsoft.com5 pointszdw7 years ago