summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Luben Tuikov <ltuikov@yahoo.com>2006-08-13 00:34:37 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-08-13 01:46:28 -0700
commite77235ea38385a127d2afc969435a56d3ff2b16d (patch)
tree61a5a673a6d926f1588df57683f7e743ef0dff01 /git-merge-resolve.sh
parentGIT 1.4.2 (diff)
downloadtgif-e77235ea38385a127d2afc969435a56d3ff2b16d.tar.xz
Fix regex pattern in commit-msg
Between the count and the line output, some uniq(1) versions put a TAB character, not a space. Make sure both are handled. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions