gistfile1.txt

$ git branch
  caleb
* master
[peter@petercommand hime]$ git merge --ff caleb/master
Auto-merging configure
Removing distro/debian/HOBA/COPYING.png
Removing distro/debian/HOBA/COPYING.txt
Removing distro/debian/HOBA/SS1135_ST.jpg
Removing distro/debian/HOBA/SS1135_ST_75x75.jpg
Removing distro/debian/HOBA/SS1208_DT.jpg
Removing distro/debian/HOBA/SS1208_DT_75x75.jpg
Merge made by recursive.
 configure                              |   11 +++++++----
 distro/debian/HOBA/COPYING.png         |  Bin 80123 -> 0 bytes
 distro/debian/HOBA/COPYING.txt         |    4 ----
 distro/debian/HOBA/SS1135_ST.jpg       |  Bin 32690 -> 0 bytes
 distro/debian/HOBA/SS1135_ST_75x75.jpg |  Bin 11718 -> 0 bytes
 distro/debian/HOBA/SS1208_DT.jpg       |  Bin 37907 -> 0 bytes
 distro/debian/HOBA/SS1208_DT_75x75.jpg |  Bin 12801 -> 0 bytes
 distro/debian/rules                    |    2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)
 delete mode 100644 distro/debian/HOBA/COPYING.png
 delete mode 100644 distro/debian/HOBA/COPYING.txt
 delete mode 100644 distro/debian/HOBA/SS1135_ST.jpg
 delete mode 100644 distro/debian/HOBA/SS1135_ST_75x75.jpg
 delete mode 100644 distro/debian/HOBA/SS1208_DT.jpg
 delete mode 100644 distro/debian/HOBA/SS1208_DT_75x75.jpg