| commit | 3762932566eb538e640deb32358f68ec4c28ad7f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Mar 2011 00:38:59 +0000 (9 16:38 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Mar 2011 00:38:59 +0000 (9 16:38 -0800) | ||
| tree | 7f572adeea816b5af8f1ee6c131967aa40dc768b | treesnapshot (tar.gz zip) |
| parent | 6ec48e7382a572734d4ea9f6c2803dd64f5bb2e2 | commitdiff |
| parent | b2c8c0a762745768e8fb249949801c1aed8f7c1d | commitdiff |
Merge branch 'en/merge-recursive' into next
* en/merge-recursive:
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: 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 | blobhistory |
| t/t6022-merge-rename.sh | diff1 | diff2 | blobhistory |