From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 19 Feb 2013 23:40:14 +0000 (+1100)
Subject: make_summ: include merge aborts
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=4be5efd76e14fd10b967e091feea1dc01b7c9bfb;p=next-scripts

make_summ: include merge aborts
---

diff --git a/make_summ b/make_summ
index 6dc3b8b..88006d3 100755
--- 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