diff tests/test-inotify-issue1542.t @ 12664:545ec1775021

merge: handle no file parent in backwards merge (issue2364)
author Matt Mackall <mpm@selenic.com>
date Sat, 09 Oct 2010 14:50:20 -0500
parents 92b2c876a79d
children f7c4eb60b0c3
line wrap: on
line diff