From 49eb4538495bef8fc7d86c7e5b4339071a863d60 Mon Sep 17 00:00:00 2001
From: Sami Samhuri <sami@samhuri.net>
Date: Wed, 10 Jun 2015 11:19:38 -0700
Subject: [PATCH] more useful

---
 git-diff-merge-conflict-resolution | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-diff-merge-conflict-resolution b/git-diff-merge-conflict-resolution
index f5c19ae..7e47103 100755
--- a/git-diff-merge-conflict-resolution
+++ b/git-diff-merge-conflict-resolution
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-git diff-tree --cc $1
+git diff-tree --color --cc $1 | less