Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Make "subtree" part more orthogonal to the rest of merge-recursive. | Junio C Hamano | 2010-01-17 |
* | Improved const correctness for strings | Shawn O. Pearce | 2007-10-21 |
* | War on whitespace | Junio C Hamano | 2007-06-07 |
* | A new merge stragety 'subtree'. | Junio C Hamano | 2007-04-07 |