168:memcached ingenthr$ git checkout -b mergingwin32again
Branch mergingwin32again set up to track local branch master by rebasing.
Switched to a new branch 'mergingwin32again'
168:memcached ingenthr$ git status
# On branch mergingwin32again
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	.buildbot/
nothing added to commit but untracked files present (use "git add" to track)
168:memcached ingenthr$ git describe
1.4.4
168:memcached ingenthr$ git pull capt win32
From git://github.com/CaptTofu/memcached
 * branch            win32      -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Fast-forwarded mergingwin32again to 9c660c0d4c5b5fd8db6357cd75409ffcb5e1dbad.
168:memcached ingenthr$ git describe
1.4.4-14-g9c660c0
168:memcached ingenthr$ git show-branch HEAD memc/master capt/win32
! [HEAD] Found an error in the compile, post merge. WIN32 define needed to be extended
 ! [memc/master] Allow noreply mixed with 0 delay.
  ! [capt/win32] Found an error in the compile, post merge. WIN32 define needed to be extended
---
+ + [HEAD] Found an error in the compile, post merge. WIN32 define needed to be extended
+ + [HEAD^] Fixed the stop_sever() function, using event_base_loopexit()
+ + [HEAD~2] Fixed issue with even_loop() by using event_base_loop()
+ + [HEAD~3] Added NTService hooks
+ + [HEAD~4] Making sure everything is committed and up to date
+ + [HEAD~5] Bumped win32/version.h to show correct version
+ + [HEAD~6] Changes to config.h
+ + [HEAD~7] Added Makefile.mingw
+ + [HEAD~8] Clean, fresh, win32 patch applied!
+ + [HEAD~9] merge fixes
+ + [HEAD~10] Fix bad merge.
+ + [HEAD~11] config.h for windows is hand-crafted for now.
+ + [HEAD~12] Updated build batch and instruction files to go with MinGW.
+ + [HEAD~13] Added support for WIN32 compilations
+++ [memc/master] Allow noreply mixed with 0 delay.