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