Properly handle merge commits in the export/cherry-pick guis
treeabe2e5f153404f840304a82712dbef26275e5094
-rw-r--r-- 87 .gitignore
-rw-r--r-- 17987 COPYING
-rw-r--r-- 2003 README
-rw-r--r-- 221 TODO
drwxr-xr-x - bin
drwxr-xr-x - buildutils
-rwxr-xr-x 2518 configure
drwxr-xr-x - icons
drwxr-xr-x - po
drwxr-xr-x - scripts
drwxr-xr-x - ugitlibs
drwxr-xr-x - ui
-rw-r--r-- 1628 wscript