[PATCHv3 0/3] Fix unnecessary (mtime) updates of files during merge

[Elijah Newren <newren@gmail.com>]

This patch series fixes a bug reported by Stephen Rothwell -- that
during merges git would unnecessarily update modification times of
files.  As noted by both Jeff and Junio, it's a bit of a band-aid
since it doesn't dive into fixing make_room_for_path() and
make_room_for_directories_of_df_conflicts(), but that would be a
much bigger and more invasive change.

Changes since last version:
  * Portability fixes for the tests suggested by Hannes (thanks!)
  * Additional test cleanups suggested by Jeff
  * Jeff's acks have been added

Elijah Newren (3):
  t6022: New test checking for unnecessary updates of renamed+modified files
  t6022: New test checking for unnecessary updates of files in D/F conflicts
  merge-recursive: When we detect we can skip an update, actually skip it

 merge-recursive.c       |   17 ++++++++----
 t/t6022-merge-rename.sh |   65 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 6 deletions(-)

-- 
1.7.4