about summary refs log tree commit diff
path: root/third_party/git/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2019-11-01T15·23-0400
committerVincent Ambo <tazjin@google.com>2020-05-17T14·57+0100
commitadff9913c02737d25a53d8f3695b51a301cff117 (patch)
tree8dc895ea2526377e1ea1e18596c62e78eb1b5aca /third_party/git/Documentation/git-merge.txt
parent8481ff43514c1cb39ebc2fdec654638afa04549d (diff)
docs(3p/nix): Clean up descriptions in Meson r/736
  1. Fix that for libsodium

  2. Consistently capitalize

(cherry picked from commit 12ce28bdf21d1f261132bdefe3dac25b1aab7dcc)
Diffstat (limited to 'third_party/git/Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions