comparison tests/test-push-r @ 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 d4a3a8a332ab
children c0b449154a90
comparison
equal deleted inserted replaced
3399:5dbb3a991bbf 3407:d2b55e3c4e25