Mercurial > hg
diff contrib/mergetools.hgrc @ 13334:2b2155623ee2 stable 1.7.5
merge with crew
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 01 Feb 2011 17:29:38 -0600 |
parents | 48e549d7c6ae |
children | a87a0fcb412f |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 01 Feb 2011 17:29:38 -0600 |
parents | 48e549d7c6ae |
children | a87a0fcb412f |