Git 1.7.0.3

1. 85e51b7 Make "subtree" part more orthogonal to the rest of merge-recursive. by Junio C Hamano · 16 years ago
2. 538dfe7 Improved const correctness for strings by Shawn O. Pearce · 18 years ago
3. a6080a0 War on whitespace by Junio C Hamano · 19 years ago
4. 68faf68 A new merge stragety 'subtree'. by Junio C Hamano · 19 years ago