Keep untracked files not involved in a merge.
authorShawn O. Pearce <spearce@spearce.org>
Sun, 4 Feb 2007 05:45:54 +0000 (00:45 -0500)
committerJunio C Hamano <junkio@cox.net>
Sun, 4 Feb 2007 06:04:28 +0000 (22:04 -0800)
commit183d797...4f6c442f74309dd04c89d3cb48ded628
treed288c01...9a69178cfeb007c35677ca19376475bbcopy hash to clipboard (tree)
parent3dff537...bf1e3fda5e5a84ca5813b0c0cfd51be7copy hash to clipboard (diff)
merge-recursive.c
t/t6023-merge-rename-nocruft.sh