Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-git-import.out @ 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 | e2b69dbb2daa |
children | b70740aefa4d |
line wrap: on
line source
% new file applying patch from stdin patching file new % chmod +x applying patch from stdin % copy applying patch from stdin a a % rename applying patch from stdin copyx new rename % delete applying patch from stdin patching file copyx new rename % regular diff applying patch from stdin patching file rename % copy and modify applying patch from stdin patching file copy2 a a b a a % rename and modify applying patch from stdin patching file rename2 copy2: No such file or directory a a b c a