-
Committer:
Aaron Bentley
-
Date:
2008-08-29 01:15:34 UTC
-
mto:
(3363.12.5 paths2ids)
-
mto:
This revision was merged to the branch mainline in
revision
3663.
-
Revision ID:
aaron@aaronbentley.com-20080829011534-9uyv0pngb7w2pskl
Treat versioned files with no contents as a conflict