summaryrefslogtreecommitdiff
path: root/t/t3310-notes-merge-manual-resolve.sh
diff options
context:
space:
mode:
authorLibravatar David Barr <david.barr@cordelta.com>2010-12-12 13:41:38 +1100
committerLibravatar Jonathan Nieder <jrnieder@gmail.com>2011-03-07 01:43:58 -0600
commitdd3f42ad793b5334d506a451addcefd0054c27bb (patch)
tree4acea098f1770a26dba416e0fa922377a1d8a36e /t/t3310-notes-merge-manual-resolve.sh
parentvcs-svn: handle filenames with dq correctly (diff)
downloadtgif-dd3f42ad793b5334d506a451addcefd0054c27bb.tar.xz
vcs-svn: use mark from previous import for parent commit
With this patch, overlapping incremental imports work. Signed-off-by: David Barr <david.barr@cordelta.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Diffstat (limited to 't/t3310-notes-merge-manual-resolve.sh')
0 files changed, 0 insertions, 0 deletions