Mercurial > hg > config
diff python/hg-merge.py @ 303:266d6b337373
still doesnt work but what the fuck
author | Jeff Hammel <jhammel@mozilla.com> |
---|---|
date | Tue, 14 May 2013 16:26:44 -0700 |
parents | 7bad4b7281f2 |
children |
author | Jeff Hammel <jhammel@mozilla.com> |
---|---|
date | Tue, 14 May 2013 16:26:44 -0700 |
parents | 7bad4b7281f2 |
children |