Mercurial > hg > mercurial-crew-with-dirclash
diff MANIFEST.in @ 149:8cd45e152c83
Pass filename to $HGMERGE
This lets the merge program be slightly more user-friendly
author | mpm@selenic.com |
---|---|
date | Tue, 24 May 2005 23:34:06 -0800 |
parents | 510265b68bbf |
children | f40273b0ad7b |