Mercurial > hg > mercurial-crew-with-dirclash
diff setup.py @ 3305:e7abcf3a7c5f
filemerge: use contexts rather than my and other
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 09 Oct 2006 21:27:04 -0500 |
parents | 1f2c3983a6c5 |
children | 231e61de692c |