t6022: New test checking for unnecessary updates of files in D/F conflicts
t6022: New test checking for unnecessary updates of files in D/F conflicts

Reported-by: Stephen Rothwell <4bf0fb350827ce8d86875e76c923a478597c3cef@canb.auug.org.au>
Signed-off-by: Elijah Newren <955405675e5ddb1a110d200661c528aa223ef60f@gmail.com>
Signed-off-by: Junio C Hamano <a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com>

destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git