summaryrefslogtreecommitdiffstats
path: root/test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/MERGE_RR
diff options
context:
space:
mode:
Diffstat (limited to 'test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/MERGE_RR')
-rw-r--r--test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/MERGE_RR0
1 files changed, 0 insertions, 0 deletions
diff --git a/test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/MERGE_RR b/test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/MERGE_RR
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/MERGE_RR