summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorLibravatar Pat Thoyts <patthoyts@users.sourceforge.net>2016-10-20 11:07:24 +0100
committerLibravatar Pat Thoyts <patthoyts@users.sourceforge.net>2016-10-20 11:07:24 +0100
commitbfe43447fb78d64c1cdf4b2046032a399edc4011 (patch)
tree98d20ae619559dc69fed29455d5ea424170a5c34 /Documentation/merge-config.txt
parentMerge branch 'kb/unicode' into pu (diff)
parentgit-gui: avoid persisting modified author identity (diff)
downloadtgif-bfe43447fb78d64c1cdf4b2046032a399edc4011.tar.xz
Merge branch 'os/preserve-author' into pu
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions