diff -u -r ../fish-2.2.0/fish_tests.cpp ./fish_tests.cpp
--- ../fish-2.2.0/fish_tests.cpp 2015-07-03 15:46:59.000000000 -0400
diff -u -r ../fish-2.2.0/fish_tests.cpp ./fish_tests.cpp
--- ../fish-2.2.0/fish_tests.cpp 2015-07-03 15:46:59.000000000 -0400