Commit graph

2 commits

Author SHA1 Message Date
Guy Kisel
86d8446800 Fix off by one error in line number enumeration 2015-03-13 16:32:21 -07:00
Guy Kisel
779a42919a Add check-merge-conflict hook 2015-03-13 16:30:14 -07:00