chiark / gitweb /
~mdw / stgit / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: 808d80f)
Tutorial: Talk about conflicts when introducing StGit
authorKarl Hasselström <kha@treskal.com>
Sun, 12 Oct 2008 15:03:51 +0000 (17:03 +0200)
committerKarl Hasselström <kha@treskal.com>
Sun, 12 Oct 2008 15:03:51 +0000 (17:03 +0200)
Conflicts and conflict resolving are essential features of StGit, so
we'd better tell the user about them.

Signed-off-by: Karl Hasselström <kha@treskal.com>

No differences found
GIT patch-maintenance porcelain (local modifications)