git UI nit
From: Han-Wen Nienhuys <hidden>
Date: 2016-08-11 19:28:12
When merging changes into a dirty working copy, one may get .. Updating 62a005d..7bbd698 Makefile: needs update README: needs update config.mak.in: needs update configure.ac: needs update fatal: Entry 'Makefile' not uptodate. Cannot merge. .. This is bad error message; "uptodate" suggests that Makefile is too old. The problem is the reverse. The Makefile has been edited and hence it is 'newer'. This message should say Entry 'Makefile' is dirty. Revert or commit changes before merging -- Han-Wen Nienhuys - hanwen@xs4all.nl - http://www.xs4all.nl/~hanwen