diff make/sa.files @ 3502:27ccc1cb3748

Allow merges without state
author Gilles Duboscq <gilles.duboscq@oracle.com>
date Mon, 08 Aug 2011 16:25:26 +0200
parents c18cbe5936b8
children f6f3bb0ee072
line wrap: on
line diff