diff options
| author | Vincent Ambo <tazjin@tvl.su> | 2023-10-10T10·54+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-10-10T11·18+0000 |
| commit | da648b4707fb1d8fd6a9679669d2eb36a5f0832c (patch) | |
| tree | 26f88d0399bfc5e62e7d80c5b9f79c35686fe145 /third_party/git/Documentation/git-ls-files.txt | |
| parent | 0ad059ddfed1482713b1f3a73eedfcbb4a23a692 (diff) | |
docs(nix-1p): add section about the merge operator r/6765
Without the examples, some behaviour of the merge operator might not be clear from the previous description. Due to how pervasively the operator is used, I think it warrants a separate section. This fixes https://github.com/tazjin/nix-1p/issues/16 Change-Id: Iecba5f1cb749bef0a4987b3fc5642832a92c18d5 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9599 Autosubmit: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI Reviewed-by: flokli <flokli@flokli.de>
Diffstat (limited to 'third_party/git/Documentation/git-ls-files.txt')
0 files changed, 0 insertions, 0 deletions