annotate mercurial/__init__.py @ 2903:013921c753bd

merge with other head by default, not tip. fixes issue 339.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 15 Aug 2006 11:38:07 -0700
parents 9117c6561b0b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source