Mercurial > hg
diff tests/tinyproxy.py @ 3400: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 | 3f24bc5dee81 |
children | 08a0f04b56bd |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 15 Oct 2006 16:18:09 -0500 |
parents | 3f24bc5dee81 |
children | 08a0f04b56bd |