Mercurial > hg
view tests/test-help @ 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 | 01215ad04283 |
children | 9ed13f718e53 |
line wrap: on
line source
#!/bin/sh hg hg -q hg help hg -q help hg add -h hg add --skjdfks hg help diff hg help status hg -q help status hg help foo hg skjdfks exit 0