diff options
Diffstat (limited to 'test/integration/pullMergeConflict/expected/origin/info/exclude')
-rw-r--r-- | test/integration/pullMergeConflict/expected/origin/info/exclude | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/test/integration/pullMergeConflict/expected/origin/info/exclude b/test/integration/pullMergeConflict/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pullMergeConflict/expected/origin/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ -.DS_Store |