gistfile1.txt

# Unmerged paths:
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#       deleted by them:    includes/database.inc
#       deleted by them:    includes/database.mysql-common.inc
#       deleted by them:    includes/database.mysql.inc
#       deleted by them:    includes/database.mysqli.inc
#       deleted by them:    includes/database.pgsql.inc
#       deleted by them:    includes/image.gd.inc
#       deleted by them:    includes/install.mysql.inc
#       deleted by them:    includes/install.mysqli.inc
#       deleted by them:    includes/install.pgsql.inc
#       deleted by them:    misc/ahah.js
#       deleted by them:    misc/teaser.js
#       deleted by them:    modules/blogapi/blogapi.info
#       deleted by them:    modules/blogapi/blogapi.install
#       deleted by them:    modules/blogapi/blogapi.module
#       deleted by them:    modules/comment/comment-folded.tpl.php
#       deleted by them:    modules/comment/comment.js
#       deleted by them:    modules/forum/forum-topic-navigation.tpl.php
#       deleted by them:    modules/node/node-rtl.css
#       both modified:      modules/openid/login-bg.png
#       deleted by them:    modules/openid/xrds.inc
#       deleted by them:    modules/ping/ping.info
#       deleted by them:    modules/ping/ping.module
#       deleted by them:    modules/search/search-theme-form.tpl.php
#       both added:         modules/simpletest/files/image-1.png
#       both added:         modules/simpletest/files/image-2.jpg
#       both added:         modules/simpletest/files/image-test.jpg
#       both added:         modules/simpletest/files/image-test.png
#       deleted by them:    modules/system/admin-rtl.css
#       deleted by them:    modules/system/admin.css
#       deleted by them:    modules/system/block.tpl.php
#       deleted by them:    modules/system/box.tpl.php
#       deleted by them:    modules/system/defaults-rtl.css
#       deleted by them:    modules/system/defaults.css
#       deleted by them:    modules/system/maintenance.css
#       deleted by them:    modules/system/system-menus-rtl.css
#       deleted by them:    modules/system/system-menus.css
#       deleted by them:    modules/system/system-rtl.css
#       deleted by them:    modules/system/system.css
#       deleted by them:    modules/throttle/throttle.admin.inc
#       deleted by them:    modules/throttle/throttle.info
#       deleted by them:    modules/throttle/throttle.module
#       deleted by them:    modules/upload/upload.admin.inc
#       deleted by them:    modules/upload/upload.info
#       deleted by them:    modules/upload/upload.install
#       deleted by them:    modules/upload/upload.module
#       deleted by them:    profiles/default/default.profile
#       deleted by them:    scripts/code-style.pl
#       deleted by them:    themes/bluemarine/block.tpl.php
#       deleted by them:    themes/bluemarine/bluemarine.info
#       deleted by them:    themes/bluemarine/box.tpl.php
#       deleted by them:    themes/bluemarine/comment.tpl.php
#       deleted by them:    themes/bluemarine/node.tpl.php
#       deleted by them:    themes/bluemarine/page.tpl.php
#       deleted by them:    themes/bluemarine/style-rtl.css
#       deleted by them:    themes/bluemarine/style.css
#       deleted by them:    themes/chameleon/chameleon.info
#       deleted by them:    themes/chameleon/chameleon.theme
#       deleted by them:    themes/chameleon/common-rtl.css
#       deleted by them:    themes/chameleon/common.css
#       deleted by them:    themes/chameleon/marvin/marvin.info
#       deleted by them:    themes/chameleon/marvin/style-rtl.css
#       deleted by them:    themes/chameleon/marvin/style.css
#       deleted by them:    themes/chameleon/style-rtl.css
#       deleted by them:    themes/chameleon/style.css
#       deleted by them:    themes/garland/block.tpl.php
#       both modified:      themes/garland/logo.png
#       deleted by them:    themes/garland/minnelli/color/color.inc
#       deleted by them:    themes/garland/minnelli/minnelli.css
#       deleted by them:    themes/garland/minnelli/minnelli.info
#       deleted by them:    themes/pushbutton/block.tpl.php
#       deleted by them:    themes/pushbutton/box.tpl.php
#       deleted by them:    themes/pushbutton/comment.tpl.php
#       deleted by them:    themes/pushbutton/node.tpl.php
#       deleted by them:    themes/pushbutton/page.tpl.php
#       deleted by them:    themes/pushbutton/pushbutton.info
#       deleted by them:    themes/pushbutton/style-rtl.css
#       deleted by them:    themes/pushbutton/style.css
#