![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 28 Apr 2011 21:11:35 +0000 (14:11 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 28 Apr 2011 21:11:35 +0000 (14:11 -0700) | ||
| commit | ac9666f84a597973ef29dc7f0f7edcb3e1a3aa45 | |
| tree | 8603a2147eeff8893f88ff58a779e49dc9219e6b | tree | snapshot |
| parent | d98a509ec3e9ff22bb642f778900691d0c715ba9 | commit | diff |
| parent | b9b3eef76186d423efb684d01b3e99ef010a61de | commit | diff |
Merge branch 'en/merge-recursive'
* en/merge-recursive:
merge-recursive: tweak magic band-aid
merge-recursive: When we detect we can skip an update, actually skip it
t6022: New test checking for unnecessary updates of files in D/F conflicts
t6022: New test checking for unnecessary updates of renamed+modified files
* en/merge-recursive:
merge-recursive: tweak magic band-aid
merge-recursive: When we detect we can skip an update, actually skip it
t6022: New test checking for unnecessary updates of files in D/F conflicts
t6022: New test checking for unnecessary updates of renamed+modified files
| merge-recursive.c | diff1 | | diff2 | | blob | history |
| t/t6022-merge-rename.sh | diff1 | | diff2 | | blob | history |