[zanata/zanata-server] c05f4e: Add unit test, fix shouldMerge to check for same c...

[GitHub]

  Branch: refs/heads/rhbz1133989
  Home:   https://github.com/zanata/zanata-server
  Commit: c05f4e6d1cda679ef926ed1b5b4b795b787243aa
      https://github.com/zanata/zanata-server/commit/c05f4e6d1cda679ef926ed1b5b4b795b787243aa
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    M zanata-war/src/main/java/org/zanata/service/MergeTranslationsService.java
    M zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsWork.java
    M zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/MergeTranslationsData.dbunit.xml

  Log Message:
  -----------
  Add unit test, fix shouldMerge to check for same content