summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorBert Wesarg <bert.wesarg@googlemail.com>2009-11-25 08:50:25 +0100
committerAndreas Gruenbacher <agruen@suse.de>2009-11-25 14:23:36 +0100
commit8ffdfe56c1b3c8334601fd1bddcc3a284c53845e (patch)
treef17d37f528d08e188384c590709d1d16586d842a /test
parent714b8e6fa1f52229637e75cac96474e0ba84b87d (diff)
downloadquilt-8ffdfe56c1b3c8334601fd1bddcc3a284c53845e.tar.gz
push: update color matcher for failed merge
Patch(1) has recently changed the message for a failed merge from 'UNMERGED' to 'NOT MERGED' (See commit 87f54e80 in the patch repository). Adopt this change to quilt push's color matcher. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Diffstat (limited to 'test')
0 files changed, 0 insertions, 0 deletions