diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-25 11:09:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-25 11:09:12 -0700 |
| commit | 6f93a631acd2017c5f7c5bc29294b753588b0bea (patch) | |
| tree | f9c61e26dc718084b1274c00f00cc48495a0a484 /git-resolve-script | |
| parent | 4cae1a967a99962e51777fcc950321902cce0adf (diff) | |
| download | git-6f93a631acd2017c5f7c5bc29294b753588b0bea.tar.gz | |
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
