Mercurial > hg
comparison contrib/mergetools.hgrc @ 16291:9952ac7e0968
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 27 Mar 2012 14:37:17 -0500 |
parents | a87a0fcb412f |
children | 93bc65e970c0 |
comparison
equal
deleted
inserted
replaced
16285:e53c0b2d7b60 | 16291:9952ac7e0968 |
---|