summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes
diff options
context:
space:
mode:
authorLibravatar David Pursehouse <dpursehouse@collab.net>2018-03-17 12:31:42 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-03-19 09:47:56 -0700
commitbd9958c35883e2199ceef21b34d9b26783d30cba (patch)
tree15d5a4dc0e291c72106c5d7888df8ce9b25be9d6 /Documentation/RelNotes
parentmerge-strategies: avoid implying that "-s theirs" exists (diff)
downloadtgif-bd9958c35883e2199ceef21b34d9b26783d30cba.tar.xz
Documentation/merge-strategies: typofix
It's strategy, not stragegy. Signed-off-by: David Pursehouse <dpursehouse@collab.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes')
0 files changed, 0 insertions, 0 deletions