message no. 159317
Posted by axilla in #github at 2016-12-14T18:22:59Z
is there a good reason for the new merge conflict resolution to show up as a merge from the parent branch?
Posted by axilla in #github at 2016-12-14T18:22:59Z