| commit | 4590307a338b1a4912c7a203c71af8b8995ea885 | |
| author | Bert Wesarg <bert.wesarg@googlemail.com> | |
| Tue, 16 Nov 2010 09:21:52 +0000 (16 10:21 +0100) | ||
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | |
| Fri, 19 Nov 2010 11:25:00 +0000 (19 11:25 +0000) | ||
| tree | 2a5aee860cc1e5776a2ef78b35f9117fad67aef9 | treesnapshot (tar.gz zip) |
| parent | 46a0431b996cd19f21e0247c97b1eab2c19698fc | commitdiff |
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>
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>
| git-gui.sh | diffblobblamehistory | |
| lib/diff.tcl | diffblobblamehistory |