cherry-pick/revert: make direct internal call to merge_tree()
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: 6eb1b437933e075bd84c5cdcf5de95ed4db4820f)
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11322 Makefile
-rwxr-xr-x 74526 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows