Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/cmdutil.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 | bd29a3067b97 |
| children | 6e062d9b188f |
comparison
equal
deleted
inserted
replaced
| 2902:cd7bbb19b96e | 2903:013921c753bd |
|---|