summaryrefslogtreecommitdiff
path: root/git-resolve-script
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-25 18:09:12 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-25 18:09:12 (GMT)
commit6f93a631acd2017c5f7c5bc29294b753588b0bea (patch)
treef9c61e26dc718084b1274c00f00cc48495a0a484 /git-resolve-script
parent4cae1a967a99962e51777fcc950321902cce0adf (diff)
downloadgit-6f93a631acd2017c5f7c5bc29294b753588b0bea.zip
git-6f93a631acd2017c5f7c5bc29294b753588b0bea.tar.gz
git-6f93a631acd2017c5f7c5bc29294b753588b0bea.tar.bz2
diff.c: don't silently ignore unknown state changes in diffs.
Give them an "unknown" status, ie '?'.
Diffstat (limited to 'git-resolve-script')
0 files changed, 0 insertions, 0 deletions