David Pursehouse f9f3b27509 Send event to stream and execute hook when merge fails ...

When a change is submitted but fails to merge, execute the
`merge-failed` hook and send the `merge-failed` event to the
event stream.

Bug: Issue 1237
Change-Id: Iab988b3cfc29f22450a8f25148a53ea131e184a7

2012-10-17 17:34:14 +09:00

..

.settings

Remove timestamp from all org.eclipse.core.resources.prefs files.

2012-07-04 14:06:09 +02:00

src

Send event to stream and execute hook when merge fails

2012-10-17 17:34:14 +09:00

.gitignore

Add Intellij IDEA files to ignore list

2012-05-03 13:17:43 -07:00

pom.xml

Use juniversalchardet from Maven central

2012-08-29 12:32:43 +02:00