comparison tests/test-merge7 @ 3120:1c1e59aac82a

merge: simplify local created logic
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 21:11:26 -0500
parents e506c14382fd
children c0b449154a90
comparison
equal deleted inserted replaced
3119:b1de36a4b4df 3120:1c1e59aac82a