Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/merge.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 | bee4b7abcb01 |
children | 95cc73523983 |
comparison
equal
deleted
inserted
replaced
2902:cd7bbb19b96e | 2903:013921c753bd |
---|