spacepaste

  1.  
  2. git revert 984065055e6e39f8dd812529e11922374bd39352 -m 1
  3. error: could not revert 984065055e6e... Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
  4. hint: after resolving the conflicts, mark the corrected paths
  5. hint: with 'git add <paths>' or 'git rm <paths>'
  6. hint: and commit the result with 'git commit'
  7.