SVN: when mark that text conflict is merged, do not mark properties are merged
tree9317e8681ee88a9f157b96e6d8da9324af487632
drwxr-xr-x - RegExpSupport
drwxr-xr-x - plugins