about summary refs log tree commit diff
path: root/third_party/git/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2023-05-31T12·51+0300
committertazjin <tazjin@tvl.su>2023-06-06T11·43+0000
commitb2ff63586acbdcd8e1c8159cac2c09724306eda6 (patch)
tree528b64b82eff61075e2f44849482f779a5f07324 /third_party/git/Documentation/merge-strategies.txt
parentad0fc6549ec227b9e5688e615f8abf53b6afaced (diff)
chore(corp/rih): reverse form order r/6232
This makes more sense to me.

Change-Id: I013bf9457f20a31a9762768607f4094358e1b7cb
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8693
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Diffstat (limited to 'third_party/git/Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions