Hacker News new | ask | show | jobs
by u801e 1903 days ago
Does the --first-parent flag handle the case where the the line was change as part of a conflict resolution in the merge commit itself?