diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-18 12:47:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 12:47:18 -0700 |
| commit | bd3a97a27a97485b130802d497214be312b737f9 (patch) | |
| tree | 803a7822503dc81a00e54724f3dbe9f5963dec13 /git-merge-resolve.sh | |
| parent | 6b5005c88b3a0c360249deb8ca8b92201abaa824 (diff) | |
| parent | 65113121a50cd765033d51204213c817832c59cf (diff) | |
| download | git-bd3a97a27a97485b130802d497214be312b737f9.tar.gz | |
Merge branch 'jc/maint-follow-rename-fix'
* jc/maint-follow-rename-fix:
log: test for regression introduced in v1.7.2-rc0~103^2~2
diff --follow: do call diffcore_std() as necessary
diff --follow: do not waste cycles while recursing
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions