Sometimes side-by-side diff is not alighned properly. This is very easy to see because horizontal line under file name and properties is not on the same level.
Attached screenshot with illustration. I made this on my WinXP when I run in my versioned-properties branch (available as lp:~bialix/qbzr/versioned-properties) following command:
Sometimes side-by-side diff is not alighned properly. This is very easy to see because horizontal line under file name and properties is not on the same level.
Attached screenshot with illustration. I made this on my WinXP when I run in my versioned- properties branch (available as lp:~bialix/qbzr/versioned-properties) following command:
bzr merge --qpreview ../trunk