diff options
Diffstat (limited to '')
| -rwxr-xr-x | third_party/git/t/t6417-merge-ours-theirs.sh (renamed from third_party/git/t/t6037-merge-ours-theirs.sh) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/third_party/git/t/t6037-merge-ours-theirs.sh b/third_party/git/t/t6417-merge-ours-theirs.sh
index 0aebc6c028..0aebc6c028 100755
--- a/third_party/git/t/t6037-merge-ours-theirs.sh
+++ b/third_party/git/t/t6417-merge-ours-theirs.sh
|