![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Wed, 2 May 2007 17:56:27 +0000 (13:56 -0400) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Tue, 8 May 2007 03:35:51 +0000 (23:35 -0400) | ||
| commit | a6c9b081b6860816615e84b75bbc7916aab184e9 | |
| tree | f14239d661fcc0ce25cc4cb44b621eb8cd5ba599 | tree | snapshot |
| parent | 60aa065f6958a888d14178ca94f17a60100d3709 | commit | diff |
git-gui: Move merge support into a namespace
Like the console procs I have moved the code related to merge
support into their own namespace, so that they are isolated
from the rest of the world.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Like the console procs I have moved the code related to merge
support into their own namespace, so that they are isolated
from the rest of the world.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| git-gui.sh | diff | blob | history | |
| lib/merge.tcl | diff | blob | history |