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