summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorLibravatar Marius Storm-Olsen <marius@trolltech.com>2008-03-28 15:40:40 +0100
committerLibravatar Simon Hausmann <simon@lst.de>2008-03-28 16:27:39 +0100
commitf3e5ae4f06ae968b710d286280a46b38ae3d36e8 (patch)
treeacf9f281c0b0d29b2b6688878d338ee0ef59030a /ll-merge.c
parentGIT 1.5.5-rc2 (diff)
downloadtgif-f3e5ae4f06ae968b710d286280a46b38ae3d36e8.tar.xz
git-p4: Handle Windows EOLs properly after removal of p4 submit template handling.
git-p4s handling of Windows style EOL was broken after the removal of the p4 submit template handling in commit f2a6059. Fix that, and make getP4OpenedType() more robust. Signed-off-by: Marius Storm-Olsen <marius@trolltech.com> Signed-off-by: Simon Hausmann <simon@lst.de>
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions