diff options
| author | Bert Wesarg <bert.wesarg@googlemail.com> | 2010-11-16 10:21:52 +0100 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2010-11-19 11:25:00 +0000 |
| commit | 4590307a338b1a4912c7a203c71af8b8995ea885 (patch) | |
| tree | 2a5aee860cc1e5776a2ef78b35f9117fad67aef9 /lib/commit.tcl | |
| parent | git-gui: fix ANSI-color parsing (diff) | |
| download | git-4590307a338b1a4912c7a203c71af8b8995ea885.tar.gz git-4590307a338b1a4912c7a203c71af8b8995ea885.zip | |
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>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions