On Tue, 20 Feb 2007, Dan Connolly wrote: > And when I try to 'hg merge', I get conflicts. Maybe we can just > discard/ignore the 8a5bc100babf head/branch. I dunno. oh well. That probably would be the quickest way to resolve the conflicts. That particular changeset (the last one on that 'branch') can be reapplied manually from the diffs - I can do that once you discard it. Chimezie Ogbuji Lead Systems Analyst Thoracic and Cardiovascular Surgery Cleveland Clinic Foundation 9500 Euclid Avenue/ W26 Cleveland, Ohio 44195 Office: (216)444-8593 ogbujic@ccf.orgReceived on Wednesday, 21 February 2007 06:20:27 GMT
This archive was generated by hypermail 2.2.0+W3C-0.50 : Tuesday, 8 January 2008 14:11:47 GMT