summaryrefslogtreecommitdiffstats
path: root/theirs.xml
diff options
context:
space:
mode:
authorEduardo Pedroni <eduardo.pedroni@ch.abb.com>2019-03-08 13:48:19 +0000
committerEduardo Pedroni <eduardo.pedroni@ch.abb.com>2019-03-08 13:48:19 +0000
commitc3008dc261f94e9993114d4bb825cb57ade43589 (patch)
treeb3a849f7780cef651443966fa19ebdcfbe864aac /theirs.xml
parent976040831c81dea5c8e0b8249ef6e681d7ee6d5c (diff)
Changed output to show the file name instead of ours and theirsHEADmaster
Diffstat (limited to 'theirs.xml')
0 files changed, 0 insertions, 0 deletions