From: Karl Hasselström <kha@treskal.com>
Date: Sun, 12 Oct 2008 15:03:51 +0000 (+0200)
Subject: Tutorial: Talk about conflicts when introducing StGit
X-Git-Tag: v0.15-rc1~115
X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/808d80f8b0b7a53ff3dcfab50e863e473678cd79?hp=808d80f8b0b7a53ff3dcfab50e863e473678cd79

Tutorial: Talk about conflicts when introducing StGit

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>
---