# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@octave.org>
# Date 1347559185 14400
# Node ID 32a37a26534ba633d581fa687519fc3e8378ebc4
# Parent  892c7fbd3b359f5893f176479ea6703b4f38bb69# Parent  4d5f23285bc2222ffa55c9bf0260bf3753f0e852
Merge back diff lexer

diff -r 4d5f23285bc2 -r 32a37a26534b apps/snippet/highlight.py
--- a/apps/snippet/highlight.py	Wed Sep 12 14:08:47 2012 -0400
+++ b/apps/snippet/highlight.py	Thu Sep 13 13:59:45 2012 -0400
@@ -9,6 +9,7 @@
     ('bash', 'bash'),
     ('c', 'C'),
     ('c++', 'C++'),
+    ('diff', 'patch or diff'),
     ('java', 'Java'),
     ('matlab', 'MATLAB'),
     ('octave', 'Octave'),