Mercurial > hg
view tests/test-hgrc @ 4682:dc5920ea12f8
merge: fix small bug with a failed merge across a rename
If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy
f to fd, and util.set_exec wouldn't find the file.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 22 Jun 2007 20:44:40 -0300 |
parents | 7a7d4937272b |
children | e51c0f41f271 |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo "invalid" > .hg/hgrc hg status 2>&1 |sed -e "s:/.*\(/t/.*\):...\1:"