From: Jackson Ray Hamilton Date: Sun, 21 Feb 2016 21:47:50 +0000 (-0800) Subject: Merge commit 'f0b45f4a010d8e5680f66c9a22f433386d023466' from context-coloring X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/5d7e30e6058ba0804b49d42f93653cbd98f8816f Merge commit 'f0b45f4a010d8e5680f66c9a22f433386d023466' from context-coloring --- 5d7e30e6058ba0804b49d42f93653cbd98f8816f diff --cc packages/context-coloring/benchmark/fixtures/.nosearch index 000000000,e69de29bb..e69de29bb mode 000000,100644..100644 --- a/packages/context-coloring/benchmark/fixtures/.nosearch +++ b/packages/context-coloring/benchmark/fixtures/.nosearch diff --cc packages/context-coloring/test/fixtures/.nosearch index 000000000,e69de29bb..e69de29bb mode 000000,100644..100644 --- a/packages/context-coloring/test/fixtures/.nosearch +++ b/packages/context-coloring/test/fixtures/.nosearch