#2 Open
sjl sjl
brodie brodie

Quick hack to colorize diffs

Bitbucket cannot automatically merge this request due to conflicts.

Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:

hg update default
hg pull -r default https://bitbucket.org/sjl/cram
hg merge 8fc2f25d0cce
hg commit -m 'Merged in sjl/cram (pull request #2)'
  1. Steve Losh avatarSteve Losh

I added a small hack that uses `tput` to colorize diffs in cram's output if you use the `--color` option. Previously I was using `| pygmentize -l diff` but that was a pain in the ass to type, plus it didn't work with interactive mode.

Feel free to not take this if you don't like using `tput` to add the colors.

Comments (0)

Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.