comparison build.xml @ 341:75c452fdd76a

Merging state not detected when there's no conflicts to resolve (no merge/state file)
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Thu, 17 Nov 2011 07:04:58 +0100
parents f05c8b1f08c4
children f2c11fe7f3e9
comparison
equal deleted inserted replaced
340:a54bfe0db959 341:75c452fdd76a