summaryrefslogtreecommitdiffstats
BranchCommit messageAuthorAge
masterChanged output to show the file name instead of ours and theirsEduardo Pedroni6 years