aboutsummaryrefslogtreecommitdiff
path: root/reproduce/software/shell/git-pre-commit
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2020-06-03 21:03:00 +0100
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2020-06-03 21:03:00 +0100
commitd85dfdf8d7b0f2769d824fd4994eccec55db963a (patch)
tree93afba26310a300fe834ed5a74258ba0353fc862 /reproduce/software/shell/git-pre-commit
parentfc9bdf8d3793ffdb4168ca5c5c7ed97bbd5ab036 (diff)
parenta69f2ce5624b0b683b793a2f4cb68c7023458f15 (diff)
Imported recent updated in Maneage, minor conflict fixed
The minor conflict was with 'reproduce/software/make/high-level.mk', and in particular because we implemented the fix to Maneage's Task #15664 in this project first. After it was moved to the main Maneage branch some minor stylistic corrections were done to it, thus causing the conflict. To resolve the conflict, I simply imported the full Maneage version of the file with this command: git checkout maneage -- reproduce/software/make/high-level.mk The other conflicts were due to the deleted files (that were resolved as described in 'README-hacking.md') and the LaTeX files that I had told '.gitattributes' to ignore from the Maneage branch.
Diffstat (limited to 'reproduce/software/shell/git-pre-commit')
0 files changed, 0 insertions, 0 deletions