projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 46a0431) | patch
git-gui: respect conflict marker size
authorBert Wesarg <bert.wesarg@googlemail.com>
Tue, 16 Nov 2010 09:21:52 +0000 (10:21 +0100)
committerPat Thoyts <patthoyts@users.sourceforge.net>
Fri, 19 Nov 2010 11:25:00 +0000 (11:25 +0000)
commit4590307a338b1a4912c7a203c71af8b8995ea885
tree2a5aee860cc1e5776a2ef78b35f9117fad67aef9tree | snapshot
parent46a0431b996cd19f21e0247c97b1eab2c19698fccommit | diff
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>
git-gui.sh diff | blob | history
lib/diff.tcl diff | blob | history
Git—the stupid content tracker