Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/filelog.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 | 05257fd28591 |
children | 5df3e5cf16bc |