marco 1784782937 --- Merging r16920 into '.': 14 år sedan
..
dir1 1784782937 --- Merging r16920 into '.': 14 år sedan
dir2 1784782937 --- Merging r16920 into '.': 14 år sedan
file1.txt 1784782937 --- Merging r16920 into '.': 14 år sedan