]> git.neil.brown.name Git - wiggle.git/commitdiff
Merge pull request #15 from gobenji/master
authorNeilBrown <neilb@suse.de>
Tue, 10 Sep 2019 00:45:15 +0000 (10:45 +1000)
committerGitHub <noreply@github.com>
Tue, 10 Sep 2019 00:45:15 +0000 (10:45 +1000)
Preserve file mode when using doing --merge --replace


Trivial merge