diff options
| author |  Brian Gernhardt <brian@gernhardtsoftware.com> | 2010-08-23 16:15:47 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-08-24 09:56:34 -0700 |
| commit | 0e1b50152bfc12d2d286af17993f6356171e9ce5 (patch) | |
| tree | 7a4d834d43479aed6e1857a0164f5cd3230ad216 /builtin/merge.c | |
| parent | merge: let custom strategies intervene in trivial merges (diff) | |
| download | tgif-0e1b50152bfc12d2d286af17993f6356171e9ce5.tar.xz | |
t7606: Avoid using head as a file name
A file named 'head' gets confused with the HEAD ref on
case-insensitive file systems. Replace '>head' with '>head.new' to
match the '>head.old' files they are compared to.
Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Acked-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions