summaryrefslogtreecommitdiff
path: root/git-gui/lib/merge.tcl
diff options
context:
space:
mode:
authorStephan Beyer <s-beyer@gmx.net>2008-07-09 12:58:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-10 07:26:29 (GMT)
commit5b2fd95606cd6d564f96d9d253e7cd19263bc352 (patch)
tree5c2741d770915f32256525a6ca5f03b098571b46 /git-gui/lib/merge.tcl
parent99d698f1e703754422f1dd780487ddbff3726dc3 (diff)
downloadgit-5b2fd95606cd6d564f96d9d253e7cd19263bc352.zip
git-5b2fd95606cd6d564f96d9d253e7cd19263bc352.tar.gz
git-5b2fd95606cd6d564f96d9d253e7cd19263bc352.tar.bz2
rerere: Separate libgit and builtin functions
This patch moves rerere()-related functions into a newly created rerere.c file. The setup_rerere() function is needed by both rerere() and cmd_rerere(), so this function is moved to rerere.c and declared non-static (and "extern") in newly created rerere.h file. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions