{"push_id":845650940,"size":6,"distinct_size":2,"ref":"refs/heads/develop","head":"c2ee6005f63a75c9528b2be197a9e729d319f5ed","before":"9b2cc6537cd63ede86f0f87812855ade643f2947","commits":[{"sha":"fc2c8c8823abaf1accb467568bc264515b774a18","author":{"email":"09dc7d5025e152d90232b58d4c490220fe4b9097@fim.uni-passau.de","name":"Olaf Lessenich"},"message":"Change external line based merge tool to git merge-file.\n\nGit is way more common than RCS by now, so it is more likely to be\ninstalled on modern operating systems. With 'merge-file', it provides a\nminimal clone of RCS merge. Therefore, we can get rid of the\nadditional dependency to the rather ancient RCS.\n\nI also looked into using 'diff3 --merge -E', but found that it uses an\ninferior merge algorithm that produces larger conflicts.","distinct":false,"url":"https://api.github.com/repos/xai/featurehouse/commits/fc2c8c8823abaf1accb467568bc264515b774a18"},{"sha":"decdbb8746b7a007bfb874b661e091c887c8f101","author":{"email":"09dc7d5025e152d90232b58d4c490220fe4b9097@fim.uni-passau.de","name":"Olaf Lessenich"},"message":"Fix for --filemerge.\n\nAccording to the usage information, the argument --filemerge takes a\ntriple of variants (mine base other) and is supposed to be an\nalternative to providing an expression file with -e.\n\nHowever, this didn't really work so far, as the three arguments were\nnever used. FSTMerge just ignored them and tried to use a non-existing\nexpression file, resulting in a crash.\n\nThis is a workaround that generates a temporary expression file\ncontaining the three arguments from --filemerge.","distinct":false,"url":"https://api.github.com/repos/xai/featurehouse/commits/decdbb8746b7a007bfb874b661e091c887c8f101"},{"sha":"c7c3debdf5cf3165c542ebaf08b2928c4808c3b4","author":{"email":"09dc7d5025e152d90232b58d4c490220fe4b9097@fim.uni-passau.de","name":"Olaf Lessenich"},"message":"Change external merge tool in scripts.","distinct":false,"url":"https://api.github.com/repos/xai/featurehouse/commits/c7c3debdf5cf3165c542ebaf08b2928c4808c3b4"},{"sha":"cfa9da2c274d41fee91539edc92e9d404e720ac1","author":{"email":"09dc7d5025e152d90232b58d4c490220fe4b9097@fim.uni-passau.de","name":"Olaf Lessenich"},"message":"Update Installation instructions.","distinct":false,"url":"https://api.github.com/repos/xai/featurehouse/commits/cfa9da2c274d41fee91539edc92e9d404e720ac1"},{"sha":"633a99f77d65e44cc375e8f47a74bdc9afbe5123","author":{"email":"09dc7d5025e152d90232b58d4c490220fe4b9097@fim.uni-passau.de","name":"Olaf Lessenich"},"message":"Merge branch 'feature/filemerge' into develop","distinct":true,"url":"https://api.github.com/repos/xai/featurehouse/commits/633a99f77d65e44cc375e8f47a74bdc9afbe5123"},{"sha":"c2ee6005f63a75c9528b2be197a9e729d319f5ed","author":{"email":"09dc7d5025e152d90232b58d4c490220fe4b9097@fim.uni-passau.de","name":"Olaf Lessenich"},"message":"Merge branch 'migrate-travis' into develop","distinct":true,"url":"https://api.github.com/repos/xai/featurehouse/commits/c2ee6005f63a75c9528b2be197a9e729d319f5ed"}]}