view tests/test-issue612.out @ 10490:f2618cacb485 stable

filelog: sort meta entries, ensure deterministic order
author Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
date Tue, 16 Feb 2010 21:04:04 +0100
parents 368a4ec603cc
children
line wrap: on
line source

adding src/a.c
moving src/a.c to source/a.c
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
? src/a.o
merging src/a.c and source/a.c to source/a.c
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M source/a.c
R src/a.c
? source/a.o