Loading

Paste #phei0hx40

  1. (bin35) iron-horse$ hg up tip
  2. abort: outstanding merge conflicts
  3. (bin35) iron-horse$ hg merge --abort
  4. abort: no merge in progress

Comments