summaryrefslogtreecommitdiffstats
path: root/git-gui/lib/merge.tcl
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--git-gui/lib/merge.tcl (renamed from lib/merge.tcl)0
1 files changed, 0 insertions, 0 deletions
diff --git a/lib/merge.tcl b/git-gui/lib/merge.tcl
index 5cded2341c..5cded2341c 100644
--- a/lib/merge.tcl
+++ b/git-gui/lib/merge.tcl