]> git.tokkee.org Git - git.git/commitdiff
[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 35b6f72 f3768a6)
Merge branch 'ss/git-gui-mergetool' gitgui-0.14.0
authorPat Thoyts <patthoyts@users.sourceforge.net>
Fri, 25 Mar 2011 08:26:47 +0000 (08:26 +0000)
committerPat Thoyts <patthoyts@users.sourceforge.net>
Fri, 25 Mar 2011 08:26:47 +0000 (08:26 +0000)

Trivial merge
Git - the stupid content tracker