Comment 1 for bug 370334

The decision is made in bzrlib/transform.py:_alter_files, under the following line:
    if kind[0] == 'file' and (backups or kind[1] is None):

It needs to check if there were any uncommitted changes at the time of the merge, but it isn't clear that that information is recorded anywhere.