threads / discuss / 1915

Please undo "Use git-merge instead of git-resolve in git-pull"

Subject: Please undo "Use git-merge instead of git-resolve in git-pull"

## tl;dr

One message between Sep 22, 2005 and Sep 22, 2005.

replies: 0people: 1as markdown or json

So, like, the other day Linus Torvalds mumbled:

> Still with me?

Grasshopper still trying to keep up.

You and Petr have given me much to think about and try. Give me a moment of tree-building to grasp the pebble...

jdl