Merge branch 'ss/git-gui-mergetool'
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)
commitfbc9629...2f0cd31ab08638ebbd8f98a323329a5b
treeceab08c...317f01114d7283aba6d3fde72977bdddcopy hash to clipboard (tree)
parent35b6f72...eb998add040d95a9c89ff7ecd4d74901copy hash to clipboard (diff)
parentf3768a6...14e667205d68475df37a889abb59d2d5copy hash to clipboard (diff)