aboutsummaryrefslogtreecommitdiff
path: root/mergetools/p4merge
Commit message (Expand)AuthorAge
* mergetools/p4merge: Handle "/dev/null"David Aguilar2012-10-11
* mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-19