Merge branch 'master' of git://repo.or.cz/git-gui
[git/git.git] / git-gui / lib / merge.tcl
similarity index 100%
rename from lib/merge.tcl
rename to git-gui/lib/merge.tcl