Merge branch 'color-fix' of https://github.com/qykth-git/gitk
authorPaul Mackerras <paulus@samba.org>
Sat, 19 Dec 2015 02:29:35 +0000 (13:29 +1100)
committerPaul Mackerras <paulus@samba.org>
Sat, 19 Dec 2015 02:29:35 +0000 (13:29 +1100)
1  2 
gitk
diff --cc gitk
Simple merge