tokkee.org

Code

projects / git.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce18135 c5a4c4d)

author	Junio C Hamano <junkio@cox.net>
	Fri, 7 Apr 2006 23:52:59 +0000 (16:52 -0700)
committer	Junio C Hamano <junkio@cox.net>
	Fri, 7 Apr 2006 23:52:59 +0000 (16:52 -0700)

* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Fix incorrect invocation of getmergediffline
[PATCH] gitk: Fix searching for filenames in gitk

Trivial merge

Git - the stupid content tracker