diff options
Diffstat (limited to '')
| -rw-r--r-- | builtin/merge-ours.c (renamed from builtin-merge-ours.c) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/builtin-merge-ours.c b/builtin/merge-ours.c index 684411694f..684411694f 100644 --- a/builtin-merge-ours.c +++ b/builtin/merge-ours.c |