<commit_before># git-json-merge
A git merge driver that use [xdiff](https://github.com/dominictarr/xdiff) to automatically resolve merge conflicts in json files. It also detects indentation automatically. This project was inspired by [git-po-merge](https://github.com/beck/git-po-merge).

[![Build Status](https://travis-ci.org/jonatanpedersen/git-json-merge.svg?branch=master)](https://travis-ci.org/jonatanpedersen/git-json-merge)
[![NPM Version](https://img.shields.io/npm/v/git-json-merge.svg)](https://www.npmjs.com/package/git-json-merge)

## Install
This can be done one of two ways, globally or per-project/directory:

### Globally
Install:
```sh
npm install --global git-json-merge
```
<commit_msg>adds NSP status badge<commit_after># git-json-merge
A git merge driver that use [xdiff](https://github.com/dominictarr/xdiff) to automatically resolve merge conflicts in json files. It also detects indentation automatically. This project was inspired by [git-po-merge](https://github.com/beck/git-po-merge).

[![Build Status](https://travis-ci.org/jonatanpedersen/git-json-merge.svg?branch=master)](https://travis-ci.org/jonatanpedersen/git-json-merge)
[![NPM Version](https://img.shields.io/npm/v/git-json-merge.svg)](https://www.npmjs.com/package/git-json-merge)
[![NSP Status](https://nodesecurity.io/orgs/jonatanpedersen/projects/e2019c42-70f7-40dc-a5b6-92dd87c89544/badge)](https://nodesecurity.io/orgs/jonatanpedersen/projects/e2019c42-70f7-40dc-a5b6-92dd87c89544)

## Install
This can be done one of two ways, globally or per-project/directory:

### Globally
Install:
```sh
npm install --global git-json-merge
```

{'fraction_non_alphanumeric': 0.15847665847665848, 'fraction_numerical': 0.02702702702702703, 'mean_word_length': 5.193916349809886, 'pattern_counts': {'":': 0, '<': 3, '<?xml version=': 0, '>': 3, 'https://': 14, 'lorem ipsum': 0, 'www.': 2, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '1104160', 'n_tokens_mistral': 600, 'n_tokens_neox': 559, 'n_words': 107}