[galaxy-dev] [hg] galaxy 3434: Adding missing sam_merge test files