Mercurial > hg
diff contrib/mergetools.hgrc @ 8106:9269b66fc7e7
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 21 Apr 2009 12:58:24 -0500 |
parents | 01bd0efef1b5 |
children | 6b354a763617 |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 21 Apr 2009 12:58:24 -0500 |
parents | 01bd0efef1b5 |
children | 6b354a763617 |