summaryrefslogtreecommitdiff
path: root/git-resolve-script
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-20 03:15:22 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-20 03:15:22 (GMT)
commitfc4263ce4b6a613622dbe985a8e6aca015789cf1 (patch)
treec37d083322ab4a63d5012ba89a9730f750e02cff /git-resolve-script
parent5e749e259b39a74b31f6c768588b4e628e3802cb (diff)
downloadgit-fc4263ce4b6a613622dbe985a8e6aca015789cf1.zip
git-fc4263ce4b6a613622dbe985a8e6aca015789cf1.tar.gz
git-fc4263ce4b6a613622dbe985a8e6aca015789cf1.tar.bz2
Avoid gcc warning in diff-stages.c
Put explicit parentheses around && in ||-expression.
Diffstat (limited to 'git-resolve-script')
0 files changed, 0 insertions, 0 deletions