tests/resources/merge-resolve


Log

Author Commit Date CI Message
Edward Thomson ccb30827 2014-03-11T17:19:35 Add `git_merge_status` to provide info about an upcoming merge
Edward Thomson 0ef19fe1 2014-01-20T17:13:55 Merge submodules
Edward Thomson 6b92c99b 2014-01-19T01:20:25 Don't try to merge binary files
Ben Straub 17820381 2013-11-14T14:05:52 Rename tests-clar to tests