C:\Temp\4>bzr branch a b Branched 1 revision(s). C:\Temp\4\a>echo bar > Тест.txt C:\Temp\4\a>bzr ci -m2 Committing to: C:/Temp/4/a/ modified Тест.txt Committed revision 2. C:\Temp\4\b>bzr merge --preview Merging from remembered parent location C:/Temp/4/a/ === modified file 'Тест.txt' --- Тест.txt 2009-06-02 10:41:30 +0000 +++ Тест.txt 2009-06-02 10:41:55 +0000 @@ -1,1 +1,1 @@ -foo +bar