make_summ: include merge aborts

diff --git a/make_summ b/make_summ
index 6dc3b8b7bc17dd75632add5ced1d18f6ba1a0aad..88006d3ccc2c3c94a38ab455d9f89c1b753a258a 100755 (executable)
--- a/make_summ
+++ b/make_summ
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-egrep '^\[|(git (cherry|rm|reset|checkout|quiltimport))|Merging|Applying|CONFLICT|Revert|Created commit' merge.log |
+egrep '^\[|(git (cherry|rm|reset|checkout|quiltimport|merge --abort))|Merging|Applying|CONFLICT|Revert|Created commit' merge.log |
        egrep -v 'reset HEAD\^|^Created commit [0-9a-f]*: Merge (branch|commit)|mark the corrected paths|HEAD is now at|^\[master [0-9a-f]*\] Merge( remote(-tracking)?)? branch|^hint:' >summ
 
 exit 0