Mercurial > hg > mercurial-crew-with-dirclash
diff Makefile @ 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 | c51fad25e59e |
children | 2ab464771b7d 1a7794525c2b |