Mercurial > hg
diff tests/test-rename-merge2.out @ 7768:5bf5fd1e2a74
merge: mark kept local files as readded on linear update (issue539)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 15 Feb 2009 10:50:48 -0600 |
parents | 8dca507e56ce |
children | f325574dad1a |
line wrap: on
line diff
--- a/tests/test-rename-merge2.out Mon Feb 09 07:55:42 2009 -0600 +++ b/tests/test-rename-merge2.out Sun Feb 15 10:50:48 2009 -0600 @@ -484,6 +484,7 @@ searching for copies back to rev 1 local changed a which remote deleted use (c)hanged version or (d)elete? c + a: prompt keep -> a b: versions differ -> m rev: versions differ -> m preserving b for resolve of b