author | Bert Wesarg <bert.wesarg@googlemail.com> | |
Thu, 9 Dec 2010 20:47:56 +0000 (21:47 +0100) | ||
committer | Pat Thoyts <patthoyts@users.sourceforge.net> | |
Fri, 28 Jan 2011 09:01:17 +0000 (09:01 +0000) | ||
commit | 963ceab57e0743ed76889b93d051dee828eed859 | |
tree | ad549e76836308c6e9237b69569045e415768e47 | tree | snapshot |
parent | 3c9ae64c81bf6261fa9b19de5b6134e321905838 | commit | diff |
git-gui: move 3way diff autodetect up
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
lib/diff.tcl | diff | blob | history |