aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMattias Andrée <m@maandree.se>2024-11-16 21:37:28 +0100
committerMattias Andrée <m@maandree.se>2024-11-16 21:37:28 +0100
commit2cad1014464cbe811b7ebb8c8e5617eda1bd27f4 (patch)
tree1f929599f06649f37ca2b9d6567bde4ba9c6e8f0 /Makefile
parentUpdate e-mail (diff)
downloadgit-rediff-2cad1014464cbe811b7ebb8c8e5617eda1bd27f4.tar.gz
git-rediff-2cad1014464cbe811b7ebb8c8e5617eda1bd27f4.tar.bz2
git-rediff-2cad1014464cbe811b7ebb8c8e5617eda1bd27f4.tar.xz
Use git attributes to determine conflict marker sizeHEAD1.0.3master
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions