if (diff.hasConflicts()) {
entry.conflict(file, baseFile, tmpFile);
action = FileAction.CONFLICTED;
} else {
// make the tmp file the new base
tmpFile.moveTo(baseFile);
base.update(baseFile, true);
action = FileAction.MERGED;
}
// and update the 'work'