summaryrefslogtreecommitdiffstats
path: root/test/integration/pullMergeConflict/expected/repo/.git_keep/FETCH_HEAD
blob: 9aa8406f031e797d5ff119aeeb4ef2dfd71095de (plain)
1
29c0636a86cc64292b7a6b1083c2df10de9cde6c		branch 'master' of ../origin