Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/merge.py @ 2885:26c37ebda1bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: partially revert 4ec58b157265 The change from self.repo.ui.diffopts() to ui.diffopts() causes a traceback when the diff of a changeset should be displayed in the web interface. Revert to self.repo.ui.diffopts() for now.
author Giorgos Keramidas <keramida@ceid.upatras.gr>
date Mon, 14 Aug 2006 16:06:37 +0300
parents 3d6efcbbd1c9
children bee4b7abcb01
line wrap: on
line diff