Mercurial > hg
diff contrib/mergetools.hgrc @ 12994:845c602b8635
subrepo: allow git subrepos to push and merge
(master branch only)
gitsubrepo based on patch from David Soria Parra:
http://bitbucket.org/segv/davids-poor-git-subrepo-attempt/
author | Eric Eisner <ede@mit.edu> |
---|---|
date | Sun, 14 Nov 2010 18:22:33 -0500 |
parents | 48e549d7c6ae |
children | a87a0fcb412f |