builtin-merge: allow using a custom strategy
[gitweb.git] / git-gui / GIT-VERSION-GEN
2007-02-13 Merge branch 'master' of git://repo.or.cz/git-gui
2007-02-12 Merge git-gui