![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Pat Thoyts <patthoyts@users.sourceforge.net> | |
| Fri, 25 Mar 2011 08:26:47 +0000 (08:26 +0000) | ||
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | |
| Fri, 25 Mar 2011 08:26:47 +0000 (08:26 +0000) | ||
| commit | fbc9629e2f0cd31ab08638ebbd8f98a323329a5b | |
| tree | ceab08c1317f01114d7283aba6d3fde72977bddd | tree | snapshot |
| parent | 35b6f72feb998add040d95a9c89ff7ecd4d74901 | commit | diff |
| parent | f3768a6714e667205d68475df37a889abb59d2d5 | commit | diff |
Merge branch 'ss/git-gui-mergetool'