summaryrefslogtreecommitdiffstats
BranchCommit messageAuthorAge
masterChanged output to show the file name instead of ours and theirsEduardo Pedroni6 years
 
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-16 10:38:20 +0000