tree 2a5aee860cc1e5776a2ef78b35f9117fad67aef9
parent 46a0431b996cd19f21e0247c97b1eab2c19698fc
author Bert Wesarg <bert.wesarg@googlemail.com> 1289899312 +0100
committer Pat Thoyts <patthoyts@users.sourceforge.net> 1290165900 +0000

git-gui: respect conflict marker size

Respect the conflict-marker-size attribute on paths when detecting merge
conflicts.

[PT: fixed problem with variable substitution in the regexps]

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>