marco 1784782937 --- Merging r16920 into '.': 14 years ago
..
dir1 1784782937 --- Merging r16920 into '.': 14 years ago
dir2 1784782937 --- Merging r16920 into '.': 14 years ago
file1.txt 1784782937 --- Merging r16920 into '.': 14 years ago