Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/sshrepo.py @ 3407:d2b55e3c4e25
merge: if filemerge skips merge, report as updated
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 15 Oct 2006 16:18:09 -0500 |
parents | 8770b4870e22 |
children | 0b450267cf47 |