diff python/hg-merge.py @ 439:a00edb8cf3d7

http://silverwav.wordpress.com/2010/03/21/note-ubuntu-default-folders/
author Jeff Hammel <jhammel@mozilla.com>
date Fri, 09 Aug 2013 11:27:36 -0700
parents 7bad4b7281f2
children
line wrap: on
line diff