Junio C Hamano a8fac1896d Merge branch 'ss/git-gui-mergetool' into next ...

* ss/git-gui-mergetool:
  mergetool--lib: Add Beyond Compare 3 as a tool
  mergetool--lib: Sort tools alphabetically for easier lookup

2011-03-17 16:31:09 -07:00

..

lib

Merge branch 'ss/git-gui-mergetool' into next

2011-03-17 16:31:09 -07:00

macosx

Merge git://repo.or.cz/git-gui

2008-07-27 14:09:25 -07:00

po

Merge git://repo.or.cz/git-gui

2010-09-15 12:34:48 -07:00

windows

Merge git://repo.or.cz/git-gui into pt/git-gui

2010-08-02 09:28:30 -07:00

.gitattributes

Merge git://repo.or.cz/git-gui

2008-09-25 08:41:07 -07:00

.gitignore

Merge git://repo.or.cz/git-gui

2007-11-21 00:00:56 -08:00

git-gui--askpass

Merge git://repo.or.cz/git-gui

2010-09-15 12:34:48 -07:00

git-gui.sh

Merge branch 'master' of git://repo.or.cz/git-gui

2010-11-05 10:41:09 -07:00

GIT-VERSION-GEN

Merge git://repo.or.cz/git-gui

2010-09-15 12:34:48 -07:00

Makefile

Merge git://repo.or.cz/git-gui

2010-09-15 12:34:48 -07:00