back out emacs as mergetool
trying emacs merge again with different xserver
c1
c2
Merge branch 'c2' into debmv16_04-21-2014

Conflicts:
	book/crash.cpp
c1
c2
Merge branch 'c2' into debmv16_04-21-2014

Conflicts:
	book/crash.cpp
	book/function.cpp
got emacs mergetool working with xserver MobaXterm
misc
conflict1
conflict2
Merge branch 'cf2'

Conflicts:
	book/crash.cpp
conflict4
chef node audit function in progress
Merge branch 'debmv16_04-21-2014'

Conflicts:
	book/crash.cpp