Mercurial > hg
comparison contrib/mergetools.hgrc @ 16329:b3fefbb95aad
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 31 Mar 2012 14:05:10 -0500 |
parents | a87a0fcb412f |
children | 93bc65e970c0 |
comparison
equal
deleted
inserted
replaced
16328:d388c3fc8319 | 16329:b3fefbb95aad |
---|