diff options
| -rw-r--r-- | modules/shell/git/attributes | 1 | ||||
| -rw-r--r-- | modules/shell/git/config.in | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/modules/shell/git/attributes b/modules/shell/git/attributes index 24cb25b10aa7..57ea092a232a 100644 --- a/modules/shell/git/attributes +++ b/modules/shell/git/attributes @@ -1,3 +1,2 @@ *.json diff=json -*.plist diff=plist *.json.mozlz4 diff=mozlz4 diff --git a/modules/shell/git/config.in b/modules/shell/git/config.in index 3630759a5a32..c9983ba5014d 100644 --- a/modules/shell/git/config.in +++ b/modules/shell/git/config.in @@ -32,8 +32,6 @@ textconv = @python@/bin/python -m json.tool [diff "mozlz4"] textconv = @mozlz4_textconv@ -[diff "plist"] - textconv = /usr/bin/plutil -convert xml1 -o - [filter "lfs"] clean = git-lfs clean -- %f required = true |