Merge branch 'factor-elide-middle' of git://github.com/polrop/ninja

Conflicts:
	src/util.cc

diff --cc src/util.cc
index 4ce610b,cb3e141..be2347c
--- 1/src/util.cc
--- 2/src/util.cc
+++ b/src/util.cc
@@@ -330,3 -302,25 +330,15 @@@ double GetLoadAverage() 
    return loadavg[0];
  }
  #endif // _WIN32
 -double GetLoadAverage()
 -{
 -#ifdef _WIN32
 -  return GetLoadAverage_win32();
 -#else
 -  return GetLoadAverage_unix();
 -#endif // _WIN32
 -}
 -
 -string ElideMiddle(const string& str, size_t width)
 -{
+ 
++string ElideMiddle(const string& str, size_t width) {
+   const int kMargin = 3;  // Space for "...".
+   string result = str;
+   if (result.size() + kMargin > width) {
+     int elide_size = (width - kMargin) / 2;
+     result = result.substr(0, elide_size)
+       + "..."
+       + result.substr(result.size() - elide_size, elide_size);
+   }
+   return result;
+ }

diff --cc src/util.h
Simple merge