diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-28 14:11:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-28 14:11:35 -0700 |
| commit | ac9666f84a597973ef29dc7f0f7edcb3e1a3aa45 (patch) | |
| tree | 8603a2147eeff8893f88ff58a779e49dc9219e6b /.gitignore | |
| parent | d98a509ec3e9ff22bb642f778900691d0c715ba9 (diff) | |
| parent | b9b3eef76186d423efb684d01b3e99ef010a61de (diff) | |
| download | git-ac9666f84a597973ef29dc7f0f7edcb3e1a3aa45.tar.gz | |
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
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions