diff options
-rw-r--r-- | quilt.changes | 5 | ||||
-rw-r--r-- | quilt/push.in | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/quilt.changes b/quilt.changes index 16fa888..580c955 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Nov 25 14:21:44 CET 2009 - bert.wesarg@googlemail.com + +- push: update color matcher for failed merge + +------------------------------------------------------------------- Sun Nov 22 21:32:39 CET 2009 - agruen@suse.de - No longer create backup files of new files with file mode 0. diff --git a/quilt/push.in b/quilt/push.in index c953e01..cca0681 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -72,7 +72,7 @@ colorize() { if [ -n "$opt_color" ]; then awk ' - { if (/FAILED|hunks? ignored|can'\''t find file|file .* already exists|UNMERGED/) + { if (/FAILED|hunks? ignored|can'\''t find file|file .* already exists|NOT MERGED/) print "'$color_patch_fail'" $0 "'$color_clear'" else if (/already applied$/) print "'$color_patch_fuzz'" $0 "'$color_clear'" |