Changes pushed with changeset 1af8972249c6e4ae7fd8618b1fb18b68f6fe5744
User
Push date [To Local]
ChangesetPatch author — Commit message
gszorc@mozilla.com
Sun Mar 13 22:51:09 2016 +0000
66bd14c189197635a1f532c00b1034952b6058f7Gregory Szorc — filemerge: exclude some markup languages from conflict marker detection
1af8972249c6e4ae7fd8618b1fb18b68f6fe5744Gregory Szorc — resolve: print a warning when marking a file with conflict markers
733759a015c950cf12877bbced519b92d7066b02Gregory Szorc — filemerge: extract conflict marker searching into its own function