Mercurial > hg
diff contrib/mergetools.hgrc @ 21702:99db956b88ab
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 01 Jun 2014 16:01:01 -0700 |
parents | 3191d330302f |
children | 33020e87f8c5 |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 01 Jun 2014 16:01:01 -0700 |
parents | 3191d330302f |
children | 33020e87f8c5 |