Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/util_win32.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 | e6a41cbaa260 |
children | 8b55c0ba8048 |