Merge pull request #30 from fchapoton/patch-1

trying to tell where conflicts lie

Author: vbraun

git_trac/releasemgr/app.py

@@ -129,8 +129,10 @@ def merge(self, ticket_number, close=False, allow_empty=False,
             self._commit(commit_message, allow_empty=True)
         else:
             if 'All conflicts fixed but you are still merging.' not in status:
+                conflicts = self.git.diff('--name-only', '--diff-filter=U')
+                conflicts = ','.join(conflicts.splitlines())
                 self.git.merge('--abort')
-                raise ValueError('merge was not clean')
+                raise ValueError('merge was not clean: conflicts in {}'.format(conflicts))
             self._commit(commit_message)
 
         if close: