diff tests/test-rebase-pull.t @ 20615:b96cb15ec9e0 stable 2.9.1

merge: audit the right destination file when merging with dir rename
author Mads Kiilerich <madski@unity3d.com>
date Sat, 01 Mar 2014 18:09:39 +0100
parents dc5157841361
children 328afbad6e57
line wrap: on
line diff